ACPI: merge andy-2.6 into lenb-2.6

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index e09a935b4a97e140d4dec95ff95c6f5a70a2e1ef..7217b4ec616e1a9b096acbc9d71dc4d6f179cb4a 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -66,9 +66,9 @@ config ACPI_BOOT
        default y
 
 config ACPI_SLEEP
-       bool "Sleep States"
+       bool "Sleep States (EXPERIMENTAL)"
        depends on X86 && ACPI
-       depends on SOFTWARE_SUSPEND
+       depends on EXPERIMENTAL
        default y
        ---help---
          This option adds support for ACPI suspend states.