[PATCH] pm: rework includes, remove arch ifdefs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Magnus Damm <damm@xxxxxxxxxx>

This patch contains 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())

Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
---

 These are the only generic changes needed to get
 CONFIG_HIBERNATION working on SuperH.

 include/linux/suspend.h |    3 ---
 kernel/power/disk.c     |    1 +
 kernel/power/swsusp.c   |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

--- 0001/include/linux/suspend.h
+++ work/include/linux/suspend.h	2009-02-23 14:44:28.000000000 +0900
@@ -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>
--- 0001/kernel/power/disk.c
+++ work/kernel/power/disk.c	2009-02-23 14:44:02.000000000 +0900
@@ -22,6 +22,7 @@
 #include <linux/console.h>
 #include <linux/cpu.h>
 #include <linux/freezer.h>
+#include <asm/suspend.h>
 
 #include "power.h"
 
--- 0001/kernel/power/swsusp.c
+++ work/kernel/power/swsusp.c	2009-02-23 14:43:17.000000000 +0900
@@ -51,6 +51,7 @@
 #include <linux/highmem.h>
 #include <linux/time.h>
 #include <linux/rbtree.h>
+#include <linux/io.h>
 
 #include "power.h"
 
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm

[Index of Archives]     [Linux ACPI]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [CPU Freq]     [Kernel Newbies]     [Fedora Kernel]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux