2 files changed, 9 insertions, 4 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 5f860cf67afc..330eb88108e7 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -88,9 +88,12 @@ config MMU
 config MMU_MOTOROLA
         bool
 
+config MMU_COLDFIRE
+        bool
+
 config MMU_SUN3
         bool
-        depends on MMU && !MMU_MOTOROLA
+        depends on MMU && !MMU_MOTOROLA && !MMU_COLDFIRE
 
 menu "Platform setup"
 
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile
index 09cadf1058d5..cfbf3205724a 100644
--- a/arch/m68k/mm/Makefile
+++ b/arch/m68k/mm/Makefile
@@ -4,6 +4,8 @@
 
 obj-y   := init.o
 
-obj-$(CONFIG_MMU)               += cache.o fault.o hwtest.o
-obj-$(CONFIG_MMU_MOTOROLA)      += kmap.o memory.o motorola.o
-obj-$(CONFIG_MMU_SUN3)          += sun3kmap.o sun3mmu.o
+obj-$(CONFIG_MMU)               += cache.o fault.o
+obj-$(CONFIG_MMU_MOTOROLA)      += kmap.o memory.o motorola.o hwtest.o
+obj-$(CONFIG_MMU_SUN3)          += sun3kmap.o sun3mmu.o hwtest.o
+obj-$(CONFIG_MMU_COLDFIRE)      += kmap.o memory.o mcfmmu.o
+