[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...

[pandora-kernel.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 84bbcb0..986410e 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -55,8 +55,8 @@ if ACPI_INTERPRETER
 
 config ACPI_SLEEP
        bool "Sleep States (EXPERIMENTAL)"
-       depends on X86
-       depends on EXPERIMENTAL
+       depends on X86 && (!SMP || SUSPEND_SMP)
+       depends on EXPERIMENTAL && PM
        default y
        ---help---
          This option adds support for ACPI suspend states.