From 6e747b4b83c2290b465aabd1ac006332430e2b2e Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 1 Mar 2012 16:58:20 +0000 Subject: [PATCH] ARM: riscpc: move ecard.c to arch/arm/mach-rpc RiscPC is the only platform using the Acorn expansion card support, so move it into its mach-* directory. Signed-off-by: Russell King --- arch/arm/kernel/Makefile | 1 - arch/arm/mach-rpc/Makefile | 2 +- arch/arm/{kernel => mach-rpc}/ecard.c | 0 arch/arm/{kernel => mach-rpc}/ecard.h | 0 4 files changed, 1 insertion(+), 2 deletions(-) rename arch/arm/{kernel => mach-rpc}/ecard.c (100%) rename arch/arm/{kernel => mach-rpc}/ecard.h (100%) diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 43b740d..17663c6 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -23,7 +23,6 @@ obj-$(CONFIG_LEDS) += leds.o obj-$(CONFIG_OC_ETM) += etm.o obj-$(CONFIG_ISA_DMA_API) += dma.o -obj-$(CONFIG_ARCH_ACORN) += ecard.o obj-$(CONFIG_FIQ) += fiq.o fiqasm.o obj-$(CONFIG_MODULES) += armksyms.o module.o obj-$(CONFIG_ARTHUR) += arthur.o diff --git a/arch/arm/mach-rpc/Makefile b/arch/arm/mach-rpc/Makefile index 69f2c06..f893207 100644 --- a/arch/arm/mach-rpc/Makefile +++ b/arch/arm/mach-rpc/Makefile @@ -4,7 +4,7 @@ # Object file lists. -obj-y := dma.o irq.o riscpc.o time.o +obj-y := dma.o ecard.o irq.o riscpc.o time.o obj-m := obj-n := obj- := diff --git a/arch/arm/kernel/ecard.c b/arch/arm/mach-rpc/ecard.c similarity index 100% rename from arch/arm/kernel/ecard.c rename to arch/arm/mach-rpc/ecard.c diff --git a/arch/arm/kernel/ecard.h b/arch/arm/mach-rpc/ecard.h similarity index 100% rename from arch/arm/kernel/ecard.h rename to arch/arm/mach-rpc/ecard.h -- 2.7.4