Merge branch 'linus' into release

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / setup_64.c

diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index c8b03a4f68bf8554a5f7e31b0c873474bac730f7..555db7452ebe2321ffbdcb7f19ca7e1b80522f9d 100644 (file)
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -52,6 +52,7 @@
 #endif
 
 #include "entry.h"
+#include "kernel.h"
 
 /* Used to synchronize accesses to NatSemi SUPER I/O chip configure
  * operations in asm/ns87303.h