diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 14:47:08 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 14:47:08 -0800 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /arch/m68k/kernel/vmlinux-std.lds | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
| download | kernel-crypto-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.gz kernel-crypto-94bc2be31a01a3055ec94176e595dfe208e92d3b.tar.xz kernel-crypto-94bc2be31a01a3055ec94176e595dfe208e92d3b.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/m68k/kernel/vmlinux-std.lds')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index e58654f3f8d..69d1d3d30c7 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -13,6 +13,7 @@ SECTIONS .text : { *(.text) SCHED_TEXT + LOCK_TEXT *(.fixup) *(.gnu.warning) } :text = 0x4e75 |