diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 13:09:03 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 13:09:03 -0500 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/kernel/vmlinux.lds.S | |
| parent | aa312be1987d43216e72ffce42bccf6bf81f62ed (diff) | |
| parent | 0af85dda39d9b673aca8c0ebae004ea70f3efc93 (diff) | |
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index cead8893b46b..897c1a8f1694 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -101,6 +101,7 @@ SECTIONS | |||
| 101 | __exception_text_start = .; | 101 | __exception_text_start = .; |
| 102 | *(.exception.text) | 102 | *(.exception.text) |
| 103 | __exception_text_end = .; | 103 | __exception_text_end = .; |
| 104 | IRQENTRY_TEXT | ||
| 104 | TEXT_TEXT | 105 | TEXT_TEXT |
| 105 | SCHED_TEXT | 106 | SCHED_TEXT |
| 106 | LOCK_TEXT | 107 | LOCK_TEXT |