summaryrefslogtreecommitdiff
path: root/include/linux/suspend.h
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-04-01 02:23:37 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 19:59:16 +0400
commita8af78982ff4c0b3731527b0217d286a343a3089 (patch)
tree10f0ebe13c999dd54efdf79ff606b65e7952b69d /include/linux/suspend.h
parent5f0e3da6e186598bbd2569410ab60fa645ba00c9 (diff)
downloadlinux-a8af78982ff4c0b3731527b0217d286a343a3089.tar.xz
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/linux/suspend.h')
-rw-r--r--include/linux/suspend.h3
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 @@
#ifndef _LINUX_SUSPEND_H
#define _LINUX_SUSPEND_H
-#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64)
-#include <asm/suspend.h>
-#endif
#include <linux/swap.h>
#include <linux/notifier.h>
#include <linux/init.h>