diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 17:24:55 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 17:24:55 +0900 |
| commit | 66fdc951720406deb3b0f17094cb16ec623f525d (patch) | |
| tree | 24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /arch/sh/kernel | |
| parent | f425752fc66acf1d4e47970ea704ed7d31c14173 (diff) | |
| parent | 7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff) | |
| download | kernel_samsung_aries-66fdc951720406deb3b0f17094cb16ec623f525d.zip kernel_samsung_aries-66fdc951720406deb3b0f17094cb16ec623f525d.tar.gz kernel_samsung_aries-66fdc951720406deb3b0f17094cb16ec623f525d.tar.bz2 | |
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh5/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index e640c63..7e49cb8 100644 --- a/arch/sh/kernel/cpu/sh5/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S @@ -10,6 +10,7 @@ * for more details. */ #include <linux/errno.h> +#include <linux/init.h> #include <linux/sys.h> #include <cpu/registers.h> #include <asm/processor.h> @@ -2058,10 +2059,10 @@ asm_uaccess_end: /* - * --- .text.init Section + * --- .init.text Section */ - .section .text.init, "ax" + __INIT /* * void trap_init (void) |