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 /arch/x86/power/hibernate_64.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 'arch/x86/power/hibernate_64.c')
| -rw-r--r-- | arch/x86/power/hibernate_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index 6dd000dd7933..65fdc86e923f 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 15 | #include <asm/pgtable.h> | 15 | #include <asm/pgtable.h> |
| 16 | #include <asm/mtrr.h> | 16 | #include <asm/mtrr.h> |
| 17 | #include <asm/suspend.h> | ||
| 17 | 18 | ||
| 18 | /* References to section boundaries */ | 19 | /* References to section boundaries */ |
| 19 | extern const void __nosave_begin, __nosave_end; | 20 | extern const void __nosave_begin, __nosave_end; |