@@ -1183,7 +1183,7 @@ F: Documentation/gpu/afbc.rst
ARM MFM AND FLOPPY DRIVERS
M: Ian Molton <spyro@f2s.com>
S: Maintained
-F: arch/arm/lib/floppydma.S
+F: arch/arm/mach-rpc/floppydma.S
F: arch/arm/include/asm/floppy.h
ARM PMU PROFILING AND DEBUGGING
@@ -31,7 +31,6 @@ else
endif
ifeq ($(CONFIG_ARCH_RPC),y)
- lib-y += ecard.o io-acorn.o floppydma.o
AFLAGS_delay-loop.o += -march=armv4
endif
@@ -4,4 +4,5 @@
# Object file lists.
-obj-y := dma.o ecard.o fiq.o irq.o riscpc.o time.o
+obj-y :=dma.o ecard.o ecard-loader.o fiq.o floppydma.o io-acorn.o irq.o \
+ riscpc.o time.o
similarity index 100%
rename from arch/arm/lib/ecard.S
rename to arch/arm/mach-rpc/ecard-loader.S
similarity index 100%
rename from arch/arm/lib/floppydma.S
rename to arch/arm/mach-rpc/floppydma.S
similarity index 100%
rename from arch/arm/lib/io-acorn.S
rename to arch/arm/mach-rpc/io-acorn.S
Move the assembly files for RiscPC from arch/arm/lib to mach-rpc so that we contain RiscPC bits in one subdirectory. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- MAINTAINERS | 2 +- arch/arm/lib/Makefile | 1 - arch/arm/mach-rpc/Makefile | 3 ++- arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} | 0 arch/arm/{lib => mach-rpc}/floppydma.S | 0 arch/arm/{lib => mach-rpc}/io-acorn.S | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/{lib/ecard.S => mach-rpc/ecard-loader.S} (100%) rename arch/arm/{lib => mach-rpc}/floppydma.S (100%) rename arch/arm/{lib => mach-rpc}/io-acorn.S (100%)