diff options
| author |   Magnus Damm <damm@igel.co.jp> | 2009-03-31 15:23:37 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 08:59:16 -0700 |
| commit | a8af78982ff4c0b3731527b0217d286a343a3089 (patch) | |
| tree | 10f0ebe13c999dd54efdf79ff606b65e7952b69d /kernel/power/swsusp.c | |
| parent | alpha: convert u64 to unsigned long long (diff) | |
| download | linux-dev-a8af78982ff4c0b3731527b0217d286a343a3089.tar.xz linux-dev-a8af78982ff4c0b3731527b0217d286a343a3089.zip | |
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 '')
| -rw-r--r-- | kernel/power/swsusp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index 1ee6636414b2..78c35047586d 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" |