diff --git a/[refs] b/[refs]
index aecaf141d4bf..39f07b2e0266 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f9e2cdcd958691cc691ad1ca2b1e8b9f535967
+refs/heads/master: 40c1b9cfeedf79b909c961e0e00a13497e80bc82
diff --git a/trunk/arch/m68k/kernel/vmlinux.lds_no.S b/trunk/arch/m68k/kernel/vmlinux-nommu.lds
similarity index 100%
rename from trunk/arch/m68k/kernel/vmlinux.lds_no.S
rename to trunk/arch/m68k/kernel/vmlinux-nommu.lds
diff --git a/trunk/arch/m68k/kernel/vmlinux.lds.S b/trunk/arch/m68k/kernel/vmlinux.lds.S
index 030dabf0bc53..3d99a04f2394 100644
--- a/trunk/arch/m68k/kernel/vmlinux.lds.S
+++ b/trunk/arch/m68k/kernel/vmlinux.lds.S
@@ -1,5 +1,14 @@
 #ifdef CONFIG_MMU
-#include "vmlinux.lds_mm.S"
+PHDRS
+{
+  text PT_LOAD FILEHDR PHDRS FLAGS (7);
+  data PT_LOAD FLAGS (7);
+}
+#ifdef CONFIG_SUN3
+#include "vmlinux-sun3.lds"
 #else
-#include "vmlinux.lds_no.S"
+#include "vmlinux-std.lds"
+#endif
+#else
+#include "vmlinux-nommu.lds"
 #endif
diff --git a/trunk/arch/m68k/kernel/vmlinux.lds_mm.S b/trunk/arch/m68k/kernel/vmlinux.lds_mm.S
deleted file mode 100644
index 99ba315bd0a8..000000000000
--- a/trunk/arch/m68k/kernel/vmlinux.lds_mm.S
+++ /dev/null
@@ -1,10 +0,0 @@
-PHDRS
-{
-  text PT_LOAD FILEHDR PHDRS FLAGS (7);
-  data PT_LOAD FLAGS (7);
-}
-#ifdef CONFIG_SUN3
-#include "vmlinux-sun3.lds"
-#else
-#include "vmlinux-std.lds"
-#endif