Merge tag 'v4.0-rc2' into timers/core, to refresh the tree before pulling more changes

[firefly-linux-kernel-4.4.55.git] / arch / m68k / mm / Makefile

diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile
index 09cadf1058d5c6b948a8dd3b1016c6f6bc79068f..cfbf3205724a03c011c3f809716a16830f8c80b0 100644 (file)
--- 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
+