4 files changed, 1 insertions, 20 deletions

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 7e138d61e29..65f5844225c 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -115,7 +115,6 @@ core-$(CONFIG_M68000)		+= arch/m68k/platform/68328/
 core-$(CONFIG_M68EZ328)         += arch/m68k/platform/68EZ328/
 core-$(CONFIG_M68VZ328)         += arch/m68k/platform/68VZ328/
 core-$(CONFIG_COLDFIRE)         += arch/m68k/platform/coldfire/
-core-$(CONFIG_M528x)            += arch/m68k/platform/528x/
 core-$(CONFIG_M5307)            += arch/m68k/platform/5307/
 core-$(CONFIG_M532x)            += arch/m68k/platform/532x/
 core-$(CONFIG_M5407)            += arch/m68k/platform/5407/
diff --git a/arch/m68k/platform/528x/Makefile b/arch/m68k/platform/528x/Makefile
deleted file mode 100644
index 8755c9e6c66..00000000000
--- a/arch/m68k/platform/528x/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Makefile for the 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/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile
index 8bef3463de2..cdd884e49f4 100644
--- a/arch/m68k/platform/coldfire/Makefile
+++ b/arch/m68k/platform/coldfire/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_M523x)	+= m523x.o pit.o dma_timer.o intc-2.o reset.o
 obj-$(CONFIG_M5249)     += m5249.o timers.o intc.o intc-5249.o reset.o
 obj-$(CONFIG_M527x)     += m527x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5272)     += m5272.o intc-5272.o timers.o
-obj-$(CONFIG_M528x)     += pit.o intc-2.o reset.o
+obj-$(CONFIG_M528x)     += m528x.o pit.o intc-2.o reset.o
 obj-$(CONFIG_M5307)     += 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
diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/coldfire/m528x.c
index 7ed1276b29d..7ed1276b29d 100644
--- a/arch/m68k/platform/528x/config.c
+++ b/arch/m68k/platform/coldfire/m528x.c