diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2011-02-25 22:59:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-16 18:19:13 -0700 |
| commit | a2a211cb55f0f3d13d791f3d2adccc96032e6846 (patch) | |
| tree | d34928332d2dd9524765ee2ad2af24b06d85a2c8 /arch/sparc/kernel/kernel.h | |
| parent | 81043e811191b5ccc1e6c170ed26f4ac8388834f (diff) | |
sparc32: fix build with leon or floppy enabled
Add a few includes back required to build with floppy enabled
Fix declaration of trapbase_cpu* so it is now consistent
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/kernel.h')
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 7eb73631438..24ad449886b 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -3,6 +3,8 @@ #include <linux/interrupt.h> +#include <asm/traps.h> + /* cpu.c */ extern const char *sparc_cpu_type; extern const char *sparc_pmu_type; @@ -54,9 +56,9 @@ extern unsigned int t_nmi[]; extern unsigned int linux_trap_ipi15_sun4d[]; extern unsigned int linux_trap_ipi15_sun4m[]; -extern unsigned long trapbase_cpu1[]; -extern unsigned long trapbase_cpu2[]; -extern unsigned long trapbase_cpu3[]; +extern struct tt_entry trapbase_cpu1; +extern struct tt_entry trapbase_cpu2; +extern struct tt_entry trapbase_cpu3; extern char cputypval[]; |