From c296e51f7942e54ba40ad28e53b2f90da07b5d99 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Thu, 8 Dec 2011 15:39:05 +1000
Subject: [PATCH] --- yaml --- r: 279713 b: refs/heads/master c:
 40c1b9cfeedf79b909c961e0e00a13497e80bc82 h: refs/heads/master i:   279711:
 8f40cefd3585f15e9b6e54305bb7ad22a23aad7a v: v3

---
 [refs]                                              |  2 +-
 .../kernel/{vmlinux.lds_no.S => vmlinux-nommu.lds}  |  0
 trunk/arch/m68k/kernel/vmlinux.lds.S                | 13 +++++++++++--
 trunk/arch/m68k/kernel/vmlinux.lds_mm.S             | 10 ----------
 4 files changed, 12 insertions(+), 13 deletions(-)
 rename trunk/arch/m68k/kernel/{vmlinux.lds_no.S => vmlinux-nommu.lds} (100%)
 delete mode 100644 trunk/arch/m68k/kernel/vmlinux.lds_mm.S

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