X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fpower%2FKconfig;fp=kernel%2Fpower%2FKconfig;h=53a12822abe66e303945e09b1e825eb77f7f9b99;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=619ecabf7c581870e328588b8c0cc6567d9b9f67;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 619ecabf7..53a12822a 100644 --- 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