Merge branch 'linus' into core/softlockup

[pandora-kernel.git] / include / linux / suspend.h

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index c7d9bb1..3e3a436 100644 (file)
--- 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>