diff options
| author | Magnus Damm <damm@igel.co.jp> | 2009-03-31 18:23:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:16 -0400 |
| commit | a8af78982ff4c0b3731527b0217d286a343a3089 (patch) | |
| tree | 10f0ebe13c999dd54efdf79ff606b65e7952b69d /kernel/power/swsusp.c | |
| parent | 5f0e3da6e186598bbd2569410ab60fa645ba00c9 (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/swsusp.c')
| -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 @@ | |||
| 51 | #include <linux/highmem.h> | 51 | #include <linux/highmem.h> |
| 52 | #include <linux/time.h> | 52 | #include <linux/time.h> |
| 53 | #include <linux/rbtree.h> | 53 | #include <linux/rbtree.h> |
| 54 | #include <linux/io.h> | ||
| 54 | 55 | ||
| 55 | #include "power.h" | 56 | #include "power.h" |
| 56 | 57 | ||