Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 46a5e5acff97aaa86b4d3429e33fe07ca03d7bf4..fc311a4673a25e451e94c1eef38c00bc425acf5a 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -19,6 +19,15 @@ config PM
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 
+config PM_LEGACY
+       bool "Legacy Power Management API"
+       depends on PM
+       default y
+       ---help---
+          Support for pm_register() and friends.
+
+          If unsure, say Y.
+
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM
@@ -27,12 +36,21 @@ 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
+       default y
+       ---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).
+
 config SOFTWARE_SUSPEND
        bool "Software Suspend"
-       depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || 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 APM.
+         It doesn't need ACPI or APM.
          You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
          (patch for sysvinit needed).