diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:55:17 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:55:17 -0500 |
| commit | b675b3667f6729dcd1036a2a129b35445947f905 (patch) | |
| tree | 0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /arch/m68k/kernel/vmlinux.lds.S | |
| parent | 104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'arch/m68k/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m68k/kernel/vmlinux.lds.S | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S index 030dabf0bc53..69ec79638870 100644 --- a/arch/m68k/kernel/vmlinux.lds.S +++ b/arch/m68k/kernel/vmlinux.lds.S | |||
| @@ -1,5 +1,14 @@ | |||
| 1 | #ifdef CONFIG_MMU | 1 | #if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) |
| 2 | #include "vmlinux.lds_mm.S" | 2 | PHDRS |
| 3 | { | ||
| 4 | text PT_LOAD FILEHDR PHDRS FLAGS (7); | ||
| 5 | data PT_LOAD FLAGS (7); | ||
| 6 | } | ||
| 7 | #ifdef CONFIG_SUN3 | ||
| 8 | #include "vmlinux-sun3.lds" | ||
| 3 | #else | 9 | #else |
| 4 | #include "vmlinux.lds_no.S" | 10 | #include "vmlinux-std.lds" |
| 11 | #endif | ||
| 12 | #else | ||
| 13 | #include "vmlinux-nommu.lds" | ||
| 5 | #endif | 14 | #endif |