[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index eded2e81cc1b91db8b60190611a1c0bcd52c4dbd..66c60982ba4677421c351447fca646d0c451d711 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.