---

yaml --- r: 279713 b: refs/heads/master c: 40c1b9c h: refs/heads/master i: 279711: 8f40cef v: v3
git-mirror · Dec 24, 2011 · c296e51 · c296e51
1 parent 0719cc2
commit c296e51
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git 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 → trunk/arch/m68k/kernel/vmlinux-nommu.lds b/trunk/arch/m68k/kernel/vmlinux.lds_no.S → 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
@@ -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