ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source

As it was a synonym for (CONFIG_ACPI && CONFIG_X86),
the ifdefs for it were more clutter than they were worth.

For ia64, just add a few stubs in anticipation of future
S3 or S4 support.

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 524cbf151fc2..251344cb29ae 100644
--- 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,13 +45,6 @@ menuconfig ACPI
 
 if ACPI
 
-config ACPI_SLEEP
-        bool
-        depends on X86
-        select HOTPLUG_CPU if SMP
-        select SUSPEND_SMP if SMP
-        default y
-
 config ACPI_PROCFS
         bool "Deprecated /proc/acpi files"
         depends on PROC_FS