From ef0208b8a229826536827d126044f110e40f014f Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Tue, 31 Mar 2009 15:23:37 -0700
Subject: [PATCH] --- yaml --- r: 139173 b: refs/heads/master c:
 a8af78982ff4c0b3731527b0217d286a343a3089 h: refs/heads/master i:   139171:
 ddf2dc959b3958a9d7d1d53d4c8bb20010d950a7 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/asm-offsets_32.c | 1 +
 trunk/arch/x86/kernel/asm-offsets_64.c | 1 +
 trunk/arch/x86/power/cpu_32.c          | 1 +
 trunk/arch/x86/power/cpu_64.c          | 1 +
 trunk/arch/x86/power/hibernate_64.c    | 1 +
 trunk/include/linux/suspend.h          | 3 ---
 trunk/kernel/power/disk.c              | 1 +
 trunk/kernel/power/swsusp.c            | 1 +
 9 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b2b8f43b2068..e491c8e38118 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f0e3da6e186598bbd2569410ab60fa645ba00c9
+refs/heads/master: a8af78982ff4c0b3731527b0217d286a343a3089
diff --git a/trunk/arch/x86/kernel/asm-offsets_32.c b/trunk/arch/x86/kernel/asm-offsets_32.c
index fbf2f33e3080..5a6aa1c1162f 100644
--- a/trunk/arch/x86/kernel/asm-offsets_32.c
+++ b/trunk/arch/x86/kernel/asm-offsets_32.c
@@ -18,6 +18,7 @@
 #include <asm/thread_info.h>
 #include <asm/bootparam.h>
 #include <asm/elf.h>
+#include <asm/suspend.h>
 
 #include <xen/interface/xen.h>
 
diff --git a/trunk/arch/x86/kernel/asm-offsets_64.c b/trunk/arch/x86/kernel/asm-offsets_64.c
index 8793ab33e2c1..e72f062fb4b5 100644
--- a/trunk/arch/x86/kernel/asm-offsets_64.c
+++ b/trunk/arch/x86/kernel/asm-offsets_64.c
@@ -16,6 +16,7 @@
 #include <asm/thread_info.h>
 #include <asm/ia32.h>
 #include <asm/bootparam.h>
+#include <asm/suspend.h>
 
 #include <xen/interface/xen.h>
 
diff --git a/trunk/arch/x86/power/cpu_32.c b/trunk/arch/x86/power/cpu_32.c
index 274d06082f48..ce702c5b3a2c 100644
--- a/trunk/arch/x86/power/cpu_32.c
+++ b/trunk/arch/x86/power/cpu_32.c
@@ -12,6 +12,7 @@
 #include <asm/mtrr.h>
 #include <asm/mce.h>
 #include <asm/xcr.h>
+#include <asm/suspend.h>
 
 static struct saved_context saved_context;
 
diff --git a/trunk/arch/x86/power/cpu_64.c b/trunk/arch/x86/power/cpu_64.c
index e3b6cf70d62c..5343540f2607 100644
--- a/trunk/arch/x86/power/cpu_64.c
+++ b/trunk/arch/x86/power/cpu_64.c
@@ -15,6 +15,7 @@
 #include <asm/pgtable.h>
 #include <asm/mtrr.h>
 #include <asm/xcr.h>
+#include <asm/suspend.h>
 
 static void fix_processor_context(void);
 
diff --git a/trunk/arch/x86/power/hibernate_64.c b/trunk/arch/x86/power/hibernate_64.c
index 6dd000dd7933..65fdc86e923f 100644
--- a/trunk/arch/x86/power/hibernate_64.c
+++ b/trunk/arch/x86/power/hibernate_64.c
@@ -14,6 +14,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mtrr.h>
+#include <asm/suspend.h>
 
 /* References to section boundaries */
 extern const void __nosave_begin, __nosave_end;
diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h
index c7d9bb1832ba..3e3a4364cbff 100644
--- a/trunk/include/linux/suspend.h
+++ b/trunk/include/linux/suspend.h
@@ -1,9 +1,6 @@
 #ifndef _LINUX_SUSPEND_H
 #define _LINUX_SUSPEND_H
 
-#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64)
-#include <asm/suspend.h>
-#endif
 #include <linux/swap.h>
 #include <linux/notifier.h>
 #include <linux/init.h>
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index e886d1332a10..f3db382c2b2d 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -22,6 +22,7 @@
 #include <linux/console.h>
 #include <linux/cpu.h>
 #include <linux/freezer.h>
+#include <asm/suspend.h>
 
 #include "power.h"
 
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index 1ee6636414b2..78c35047586d 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -51,6 +51,7 @@
 #include <linux/highmem.h>
 #include <linux/time.h>
 #include <linux/rbtree.h>
+#include <linux/io.h>
 
 #include "power.h"