Merge ../torvalds-2.6/

[pandora-kernel.git] / arch / parisc / kernel / head.S

diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index ddf7e91..28405ed 100644 (file)
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -14,7 +14,7 @@
 
 #include <linux/autoconf.h>    /* for CONFIG_SMP */
 
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/psw.h>
 #include <asm/pdc.h>