summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/kernel.h
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2011-02-26 09:59:20 +0300
committerDavid S. Miller <davem@davemloft.net>2011-03-17 04:19:13 +0300
commita2a211cb55f0f3d13d791f3d2adccc96032e6846 (patch)
treed34928332d2dd9524765ee2ad2af24b06d85a2c8 /arch/sparc/kernel/kernel.h
parent81043e811191b5ccc1e6c170ed26f4ac8388834f (diff)
downloadlinux-a2a211cb55f0f3d13d791f3d2adccc96032e6846.tar.xz
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.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index 7eb736314381..24ad449886be 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[];