diff --git a/[refs] b/[refs]
index 8aa492fa5e37..0d8f85902399 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bccc43c1010f2ac88156c005fab6823569b0a39
+refs/heads/master: f225c8675086b60d85264ef824568309163d79f8
diff --git a/trunk/arch/m68k/mm/Makefile b/trunk/arch/m68k/mm/Makefile
index b60270e4954b..09cadf1058d5 100644
--- a/trunk/arch/m68k/mm/Makefile
+++ b/trunk/arch/m68k/mm/Makefile
@@ -1,5 +1,9 @@
-ifdef CONFIG_MMU
-include arch/m68k/mm/Makefile_mm
-else
-include arch/m68k/mm/Makefile_no
-endif
+#
+# Makefile for the linux m68k-specific parts of the memory manager.
+#
+
+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
diff --git a/trunk/arch/m68k/mm/Makefile_mm b/trunk/arch/m68k/mm/Makefile_mm
deleted file mode 100644
index 5eaa43c4cb3c..000000000000
--- a/trunk/arch/m68k/mm/Makefile_mm
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the linux m68k-specific parts of the memory manager.
-#
-
-obj-y		:= cache.o init.o fault.o hwtest.o
-
-obj-$(CONFIG_MMU_MOTOROLA)	+= kmap.o memory.o motorola.o
-obj-$(CONFIG_MMU_SUN3)		+= sun3kmap.o sun3mmu.o
diff --git a/trunk/arch/m68k/mm/Makefile_no b/trunk/arch/m68k/mm/Makefile_no
deleted file mode 100644
index 80579c6a6881..000000000000
--- a/trunk/arch/m68k/mm/Makefile_no
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux m68knommu specific parts of the memory manager.
-#
-
-obj-y += init.o