[RFC 17/31] proof of concept merge of m68k and m68knommu

[sfking]

---
 arch/m68k/kernel/vmlinux.lds.S                     |   11 +++--------
 .../kernel/{vmlinux.lds.S => vmlinux_mm.lds.S}     |    0 
 .../vmlinux.lds.S => m68k/kernel/vmlinux_no.lds.S} |    0 
 3 files changed, 3 insertions(+), 8 deletions(-)
 copy arch/m68k/kernel/{vmlinux.lds.S => vmlinux_mm.lds.S} (100%)
 copy arch/{m68knommu/kernel/vmlinux.lds.S => m68k/kernel/vmlinux_no.lds.S} 
(100%)

diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S
index 99ba315..de46d6b 100644
--- a/arch/m68k/kernel/vmlinux.lds.S
+++ b/arch/m68k/kernel/vmlinux.lds.S
@@ -1,10 +1,5 @@
-PHDRS
-{
-  text PT_LOAD FILEHDR PHDRS FLAGS (7);
-  data PT_LOAD FLAGS (7);
-}
-#ifdef CONFIG_SUN3
-#include "vmlinux-sun3.lds"
+#ifdef CONFIG_MMU
+#include "vmlinux_mm.lds.S"
 #else
-#include "vmlinux-std.lds"
+#include "vmlinux_no.lds.S"
 #endif
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux_mm.lds.S
similarity index 100%
copy from arch/m68k/kernel/vmlinux.lds.S
copy to arch/m68k/kernel/vmlinux_mm.lds.S
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S 
b/arch/m68k/kernel/vmlinux_no.lds.S
similarity index 100%
copy from arch/m68knommu/kernel/vmlinux.lds.S
copy to arch/m68k/kernel/vmlinux_no.lds.S
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html