Pull d-states into release branch

[linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index efd47eeb5b631018a0238702c77ee2c0a16fce33..251344cb29aea1f04f2e42935b52c68c09103ba3 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -11,6 +11,9 @@ menuconfig ACPI
        depends on PCI
        depends on PM
        select PNP
+       # for sleep
+       select HOTPLUG_CPU if X86 && SMP
+       select SUSPEND_SMP if X86 && SMP
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@ -42,26 +45,6 @@ menuconfig ACPI
 
 if ACPI
 
-config ACPI_SLEEP
-       bool "Sleep States"
-       depends on X86 && (!SMP || SUSPEND_SMP)
-       default y
-       ---help---
-         This option adds support for ACPI suspend states. 
-
-         With this option, you will be able to put the system "to sleep". 
-         Sleep states are low power states for the system and devices. All
-         of the system operating state is saved to either memory or disk
-         (depending on the state), to allow the system to resume operation
-         quickly at your request.
-
-         Although this option sounds really nifty, barely any of the device
-         drivers have been converted to the new driver model and hence few
-         have proper power management support. 
-
-         This option is not recommended for anyone except those doing driver
-         power management development.
-
 config ACPI_PROCFS
        bool "Deprecated /proc/acpi files"
        depends on PROC_FS