diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 21:49:12 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 21:49:12 +0300 |
| commit | fe377e8fb3f67d66590e41e99cd6e207d585f7dd (patch) | |
| tree | aef88767bd67100120fce449f9b21da433865969 /arch/sparc/kernel/vmlinux.lds.S | |
| parent | 946524efb4912687b6e02e831b5fbedc4c9395c0 (diff) | |
| parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) | |
Merge commit 'linus/master' into topic/slqb/core
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/sparc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/sparc/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S index 76267085b13b..fcbbd000ec08 100644 --- a/arch/sparc/kernel/vmlinux.lds.S +++ b/arch/sparc/kernel/vmlinux.lds.S @@ -41,7 +41,7 @@ SECTIONS .text TEXTSTART : { _text = .; - *(.text.head) + HEAD_TEXT TEXT_TEXT SCHED_TEXT LOCK_TEXT |