diff --git a/[refs] b/[refs]
index 303dbf366197..53eef8652050 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 927b6c4da9e30f8f55add2e19487e71415c85bda
+refs/heads/master: 6e747b4b83c2290b465aabd1ac006332430e2b2e
diff --git a/trunk/arch/arm/kernel/Makefile b/trunk/arch/arm/kernel/Makefile
index 43b740d0e374..17663c63f7a1 100644
--- a/trunk/arch/arm/kernel/Makefile
+++ b/trunk/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/trunk/arch/arm/mach-rpc/Makefile b/trunk/arch/arm/mach-rpc/Makefile
index 69f2c0656966..f89320739b09 100644
--- a/trunk/arch/arm/mach-rpc/Makefile
+++ b/trunk/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/trunk/arch/arm/kernel/ecard.c b/trunk/arch/arm/mach-rpc/ecard.c
similarity index 100%
rename from trunk/arch/arm/kernel/ecard.c
rename to trunk/arch/arm/mach-rpc/ecard.c
diff --git a/trunk/arch/arm/kernel/ecard.h b/trunk/arch/arm/mach-rpc/ecard.h
similarity index 100%
rename from trunk/arch/arm/kernel/ecard.h
rename to trunk/arch/arm/mach-rpc/ecard.h