diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/mips/kernel/vmlinux.lds.S | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/mips/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index b5470ceb418b..afb119f35682 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
| @@ -36,6 +36,7 @@ SECTIONS | |||
| 36 | SCHED_TEXT | 36 | SCHED_TEXT |
| 37 | LOCK_TEXT | 37 | LOCK_TEXT |
| 38 | KPROBES_TEXT | 38 | KPROBES_TEXT |
| 39 | *(.text.*) | ||
| 39 | *(.fixup) | 40 | *(.fixup) |
| 40 | *(.gnu.warning) | 41 | *(.gnu.warning) |
| 41 | } :text = 0 | 42 | } :text = 0 |