diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
| commit | 66fdc951720406deb3b0f17094cb16ec623f525d (patch) | |
| tree | 24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /arch/frv/kernel/head-uc-fr555.S | |
| parent | f425752fc66acf1d4e47970ea704ed7d31c14173 (diff) | |
| parent | 7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff) | |
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'arch/frv/kernel/head-uc-fr555.S')
| -rw-r--r-- | arch/frv/kernel/head-uc-fr555.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/frv/kernel/head-uc-fr555.S b/arch/frv/kernel/head-uc-fr555.S index 39937c19b460..5497aaf34f77 100644 --- a/arch/frv/kernel/head-uc-fr555.S +++ b/arch/frv/kernel/head-uc-fr555.S | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/init.h> | ||
| 12 | #include <linux/threads.h> | 13 | #include <linux/threads.h> |
| 13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
| 14 | #include <asm/ptrace.h> | 15 | #include <asm/ptrace.h> |
| @@ -29,7 +30,7 @@ | |||
| 29 | #define __551_LCR 0xfeff1100 | 30 | #define __551_LCR 0xfeff1100 |
| 30 | #define __551_LSBR 0xfeff1c00 | 31 | #define __551_LSBR 0xfeff1c00 |
| 31 | 32 | ||
| 32 | .section .text.init,"ax" | 33 | __INIT |
| 33 | .balign 4 | 34 | .balign 4 |
| 34 | 35 | ||
| 35 | ############################################################################### | 36 | ############################################################################### |