vserver 1.9.3

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

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 6bb6226..67f9552 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -18,6 +18,13 @@ config PM
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 
+config PM_DEBUG
+       bool "Power Management Debug Support"
+       ---help---
+       This option enables verbose debugging support in the Power Management
+       code. This is helpful when debugging and reporting various PM bugs, 
+       like suspend support.
+
 config SOFTWARE_SUSPEND
        bool "Software Suspend (EXPERIMENTAL)"
        depends on EXPERIMENTAL && PM && SWAP
@@ -42,33 +49,12 @@ config SOFTWARE_SUSPEND
 
          For more information take a look at Documentation/power/swsusp.txt.
 
-config PM_DISK
-       bool "Suspend-to-Disk Support"
-       depends on PM && SWAP && X86 && !X86_64
-       ---help---
-         Suspend-to-disk is a power management state in which the contents
-         of memory are stored on disk and the entire system is shut down or
-         put into a low-power state (e.g. ACPI S4). When the computer is 
-         turned back on, the stored image is loaded from disk and execution
-         resumes from where it left off before suspending. 
-
-         This config option enables the core infrastructure necessary to 
-         perform the suspend and resume transition. 
-
-         Currently, this suspend-to-disk implementation is based on a forked
-         version of the swsusp code base. As such, it's still experimental,
-         and still relies on CONFIG_SWAP. 
-
-         More information can be found in Documentation/power/.
-
-         If unsure, Say N.
-
-config PM_DISK_PARTITION
+config PM_STD_PARTITION
        string "Default resume partition"
-       depends on PM_DISK
+       depends on SOFTWARE_SUSPEND
        default ""
        ---help---
-         The default resume partition is the partition that the pmdisk suspend-
+         The default resume partition is the partition that the suspend-
          to-disk implementation will look for a suspended disk image. 
 
          The partition specified here will be different for almost every user. 
@@ -77,16 +63,10 @@ config PM_DISK_PARTITION
 
          The partition specified can be overridden by specifying:
 
-               pmdisk=/dev/<other device> 
+               resume=/dev/<other device> 
 
          which will set the resume partition to the device specified. 
 
-         One may also do: 
-
-               pmdisk=off
-
-         to inform the kernel not to perform a resume transition. 
-
          Note there is currently not a way to specify which device to save the
          suspended image to. It will simply pick the first available swap 
          device.