diff --git a/[refs] b/[refs]
index 20be7cfa3c37..6773fc3a2a88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbd7740fdfdf9475f92287a84085a1913541cd5d
+refs/heads/master: 0eb4cb9b16aba6d610a0716503b96d299b308d44
diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile
index f2c47e907037..e7fddf1e42c7 100644
--- a/trunk/arch/powerpc/kernel/Makefile
+++ b/trunk/arch/powerpc/kernel/Makefile
@@ -34,7 +34,7 @@ obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o
 obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
-obj-$(CONFIG_6xx)		+= idle_6xx.o
+obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
diff --git a/trunk/arch/ppc/kernel/l2cr.S b/trunk/arch/powerpc/kernel/l2cr_6xx.S
similarity index 100%
rename from trunk/arch/ppc/kernel/l2cr.S
rename to trunk/arch/powerpc/kernel/l2cr_6xx.S
diff --git a/trunk/arch/ppc/kernel/Makefile b/trunk/arch/ppc/kernel/Makefile
index 1b2c7458a3d0..3d50a2686839 100644
--- a/trunk/arch/ppc/kernel/Makefile
+++ b/trunk/arch/ppc/kernel/Makefile
@@ -13,7 +13,7 @@ extra-y				+= vmlinux.lds
 obj-y				:= entry.o traps.o time.o misc.o \
 					setup.o \
 					ppc_htab.o
-obj-$(CONFIG_6xx)		+= l2cr.o cpu_setup_6xx.o
+obj-$(CONFIG_6xx)		+= cpu_setup_6xx.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o
 obj-$(CONFIG_MODULES)		+= module.o ppc_ksyms.o
 obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o
@@ -34,7 +34,7 @@ endif
 # These are here while we do the architecture merge
 
 else
-obj-$(CONFIG_6xx)		+= l2cr.o cpu_setup_6xx.o
+obj-$(CONFIG_6xx)		+= cpu_setup_6xx.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-$(CONFIG_NOT_COHERENT_CACHE)	+= dma-mapping.o