Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm

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

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 6233f3b4ae6628c0676c73f09a2937f5039fcd5c..dcd165f92a887881eefaf9f67bf6c612a4a94547 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -19,16 +19,6 @@ config PM
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 
          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 (DEPRECATED)"
-       depends on PM
-       default n
-       ---help---
-          Support for pm_register() and friends.  This old API is obsoleted
-          by the driver model.
-
-          If unsure, say N.
-

 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM


@@ -92,7 +82,7 @@ config PM_SLEEP_SMP
 
 config PM_SLEEP
        bool
 
 config PM_SLEEP
        bool

-       depends on SUSPEND || HIBERNATION
+       depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE

        default y
 
 config SUSPEND
        default y
 
 config SUSPEND


@@ -104,6 +94,17 @@ config SUSPEND
          powered and thus its contents are preserved, such as the
          suspend-to-RAM state (e.g. the ACPI S3 state).
 
          powered and thus its contents are preserved, such as the
          suspend-to-RAM state (e.g. the ACPI S3 state).
 

+config PM_TEST_SUSPEND
+       bool "Test suspend/resume and wakealarm during bootup"
+       depends on SUSPEND && PM_DEBUG && RTC_LIB=y
+       ---help---
+       This option will let you suspend your machine during bootup, and
+       make it wake up a few seconds later using an RTC wakeup alarm.
+       Enable this with a kernel parameter like "test_suspend=mem".
+
+       You probably want to have your system's RTC driver statically
+       linked, ensuring that it's available when this test runs.
+

 config SUSPEND_FREEZER
        bool "Enable freezer for suspend to RAM/standby" \
                if ARCH_WANTS_FREEZER_CONTROL || BROKEN
 config SUSPEND_FREEZER
        bool "Enable freezer for suspend to RAM/standby" \
                if ARCH_WANTS_FREEZER_CONTROL || BROKEN