diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/m68k/kernel/vmlinux.lds.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/m68k/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/m68k/kernel/vmlinux.lds.S | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S index 99ba315bd0a8..030dabf0bc53 100644 --- a/arch/m68k/kernel/vmlinux.lds.S +++ b/arch/m68k/kernel/vmlinux.lds.S | |||
| @@ -1,10 +1,5 @@ | |||
| 1 | PHDRS | 1 | #ifdef CONFIG_MMU |
| 2 | { | 2 | #include "vmlinux.lds_mm.S" |
| 3 | text PT_LOAD FILEHDR PHDRS FLAGS (7); | ||
| 4 | data PT_LOAD FLAGS (7); | ||
| 5 | } | ||
| 6 | #ifdef CONFIG_SUN3 | ||
| 7 | #include "vmlinux-sun3.lds" | ||
| 8 | #else | 3 | #else |
| 9 | #include "vmlinux-std.lds" | 4 | #include "vmlinux.lds_no.S" |
| 10 | #endif | 5 | #endif |