linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 619ecab..53a1282 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -36,30 +36,12 @@ config PM_DEBUG
        code. This is helpful when debugging and reporting various PM bugs, 
        like suspend support.
 
-config PM_TRACE
-       bool "Suspend/resume event tracing"
-       depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
-       default n
-       ---help---
-       This enables some cheesy code to save the last PM event point in the
-       RTC across reboots, so that you can debug a machine that just hangs
-       during suspend (or more commonly, during resume).
-
-       To use this debugging feature you should attempt to suspend the machine,
-       then reboot it, then run
-
-               dmesg -s 1000000 | grep 'hash matches'
-
-       CAUTION: this option will cause your machine's real-time clock to be
-       set to an invalid time after a resume.
-
-
 config SOFTWARE_SUSPEND
        bool "Software Suspend"
-       depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP) && !X86_PAE) || ((FRV || PPC32) && !SMP))
+       depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)
        ---help---
          Enable the possibility of suspending the machine.
-         It doesn't need ACPI or APM.
+         It doesn't need APM.
          You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
          (patch for sysvinit needed). 
 
@@ -78,10 +60,6 @@ config SOFTWARE_SUSPEND
 
          For more information take a look at <file:Documentation/power/swsusp.txt>.
 
-         (For now, swsusp is incompatible with PAE aka HIGHMEM_64G on i386.
-         we need identity mapping for resume to work, and that is trivial
-         to get with 4MB pages, but less than trivial on PAE).
-
 config PM_STD_PARTITION
        string "Default resume partition"
        depends on SOFTWARE_SUSPEND