diff --git a/[refs] b/[refs]
index 2c1997d80a55..50dd27c3cc0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 136f148f61fb7d53f104abcf827a90bf8fa6c8f7
+refs/heads/master: 9f8c8c072dd0ce0c76dfd2277169f933b0cc6ca5
diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
index 02626a32c15f..333c0c2e0cd7 100644
--- a/trunk/arch/m68k/Makefile
+++ b/trunk/arch/m68k/Makefile
@@ -116,7 +116,6 @@ core-$(CONFIG_M68EZ328)		+= arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)		+= arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)		+= arch/m68k/platform/coldfire/
 core-$(CONFIG_M532x)		+= arch/m68k/platform/532x/
-core-$(CONFIG_M5407)		+= arch/m68k/platform/5407/
 core-$(CONFIG_M54xx)		+= arch/m68k/platform/54xx/
 
 
diff --git a/trunk/arch/m68k/platform/5407/Makefile b/trunk/arch/m68k/platform/5407/Makefile
deleted file mode 100644
index 24f3cd70d45d..000000000000
--- a/trunk/arch/m68k/platform/5407/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Makefile for the m68knommu linux kernel.
-#
-
-#
-# If you want to play with the HW breakpoints then you will
-# need to add define this,  which will give you a stack backtrace
-# on the console port whenever a DBG interrupt occurs. You have to
-# set up you HW breakpoints to trigger a DBG interrupt:
-#
-# ccflags-y := -DTRAP_DBG_INTERRUPT
-# asflags-y := -DTRAP_DBG_INTERRUPT
-#
-
-asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
-
-obj-y := config.o
-
diff --git a/trunk/arch/m68k/platform/coldfire/Makefile b/trunk/arch/m68k/platform/coldfire/Makefile
index bfe71e0be215..48dcd066f163 100644
--- a/trunk/arch/m68k/platform/coldfire/Makefile
+++ b/trunk/arch/m68k/platform/coldfire/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_M5272)	+= m5272.o intc-5272.o timers.o
 obj-$(CONFIG_M528x)	+= m528x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)	+= m5307.o timers.o intc.o reset.o
 obj-$(CONFIG_M532x)	+= timers.o intc-simr.o reset.o
-obj-$(CONFIG_M5407)	+= timers.o intc.o reset.o
+obj-$(CONFIG_M5407)	+= m5407.o timers.o intc.o reset.o
 obj-$(CONFIG_M54xx)	+= sltimers.o intc-2.o
 
 obj-$(CONFIG_NETtel)	+= nettel.o
diff --git a/trunk/arch/m68k/platform/5407/config.c b/trunk/arch/m68k/platform/coldfire/m5407.c
similarity index 100%
rename from trunk/arch/m68k/platform/5407/config.c
rename to trunk/arch/m68k/platform/coldfire/m5407.c