aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-05-03 08:31:38 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-07 06:31:14 -0400
commit543b9fd3528f64c4b20439de0edb453764482de7 (patch)
tree50271e7d5365b088bea63a5a2938aedf3aa87741 /kernel
parent7e11580b362fc64693de7ad5c11fbf3d1d9d0e50 (diff)
[POWERPC] powermac: Suspend to disk on G5
Powermac G5 suspend to disk implementation. The code is platform agnostic but only tested on powermac, no other 64-bit powerpc machines. Because nvidiafb still breaks suspend I have marked it EXPERIMENTAL on powermac and because I can't test it and some lowlevel code will need changes it is BROKEN on all other 64-bit platforms. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 51a4dd0f1b74..5001c652028c 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -79,7 +79,7 @@ config PM_SYSFS_DEPRECATED
79 79
80config SOFTWARE_SUSPEND 80config SOFTWARE_SUSPEND
81 bool "Software Suspend" 81 bool "Software Suspend"
82 depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) 82 depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
83 ---help--- 83 ---help---
84 Enable the suspend to disk (STD) functionality. 84 Enable the suspend to disk (STD) functionality.
85 85
@@ -134,7 +134,7 @@ config PM_STD_PARTITION
134 134
135config SUSPEND_SMP 135config SUSPEND_SMP
136 bool 136 bool
137 depends on HOTPLUG_CPU && X86 && PM 137 depends on HOTPLUG_CPU && (X86 || PPC64) && PM
138 default y 138 default y
139 139
140config APM_EMULATION 140config APM_EMULATION