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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/suspend.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index c7d9bb1832ba..3e3a4364cbff 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | #ifndef _LINUX_SUSPEND_H | 1 | #ifndef _LINUX_SUSPEND_H |
| 2 | #define _LINUX_SUSPEND_H | 2 | #define _LINUX_SUSPEND_H |
| 3 | 3 | ||
| 4 | #if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64) | ||
| 5 | #include <asm/suspend.h> | ||
| 6 | #endif | ||
| 7 | #include <linux/swap.h> | 4 | #include <linux/swap.h> |
| 8 | #include <linux/notifier.h> | 5 | #include <linux/notifier.h> |
| 9 | #include <linux/init.h> | 6 | #include <linux/init.h> |