Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index da49b006bcc58cb4819787cdb3156c82138180af..dc1de7224426b16d38332135faa5b1b1e0695198 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -42,7 +42,7 @@ if ACPI
 
 config ACPI_SLEEP
        bool
-       depends on PM_SLEEP
+       depends on SUSPEND || HIBERNATION
        default y
 
 config ACPI_PROCFS
@@ -160,15 +160,8 @@ config ACPI_DOCK
        tristate "Dock"
        depends on EXPERIMENTAL
        help
-         This driver adds support for ACPI controlled docking stations
-
-config ACPI_BAY
-       tristate "Removable Drive Bay (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       depends on ACPI_DOCK
-       help
-         This driver adds support for ACPI controlled removable drive
-         bays such as the IBM ultrabay or the Dell Module Bay.
+         This driver adds support for ACPI controlled docking stations and removable
+         drive bays such as the IBM ultrabay or the Dell Module Bay.
 
 config ACPI_PROCESSOR
        tristate "Processor"