diff options
author | Len Brown <len.brown@intel.com> | 2007-07-24 22:26:33 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:29:39 -0400 |
commit | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (patch) | |
tree | fb69560e2a584a8ca82985a99e42ec189d592091 /drivers/acpi/Kconfig | |
parent | 7c5aa6642fa26641ebf286966a165aec71c91991 (diff) | |
download | blackbird-op-linux-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.tar.gz blackbird-op-linux-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.zip |
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>
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 10 |
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 |