summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-31 15:23:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 08:59:16 -0700
commita8af78982ff4c0b3731527b0217d286a343a3089 (patch)
tree10f0ebe13c999dd54efdf79ff606b65e7952b69d /kernel/power
parent5f0e3da6e186598bbd2569410ab60fa645ba00c9 (diff)
pm: rework includes, remove arch ifdefs
Make the following header file changes: - remove arch ifdefs and asm/suspend.h from linux/suspend.h - add asm/suspend.h to disk.c (for arch_prepare_suspend()) - add linux/io.h to swsusp.c (for ioremap()) - x86 32/64 bit compile fixes Signed-off-by: Magnus Damm <damm@igel.co.jp> Cc: Paul Mundt <lethal@linux-sh.org> Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/disk.c1
-rw-r--r--kernel/power/swsusp.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index e886d1332a1..f3db382c2b2 100644
--- a/kernel/power/disk.c
+++ b/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/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 1ee6636414b..78c35047586 100644
--- a/kernel/power/swsusp.c
+++ b/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"