Merge changes from linux-2.6 by hand

[linux-2.6-omap-h63xx.git] / arch / ppc / kernel / swsusp.S

diff --git a/arch/ppc/kernel/swsusp.S b/arch/ppc/kernel/swsusp.S
index 55148bb88d39983bafa3251cc3a85666a45b80af..69773cc1a85f35a39b9914d17765e5ae513a6adf 100644 (file)
--- a/arch/ppc/kernel/swsusp.S
+++ b/arch/ppc/kernel/swsusp.S
@@ -5,7 +5,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 
 /*