Merge ../torvalds-2.6/
[pandora-kernel.git] / arch / s390 / kernel / head.S
index 2710e66..55654b6 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/config.h>
 #include <asm/setup.h>
 #include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>