summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-24 02:25:03 -0400
committerLen Brown <len.brown@intel.com>2007-07-24 02:25:03 -0400
commit7c5aa6642fa26641ebf286966a165aec71c91991 (patch)
tree6aa44fb98e1fd999eb0df1f5286aab9bbeff39ac /drivers
parent43532c8a46ae313c2da3baa7598a1de4d403ba83 (diff)
downloadop-kernel-dev-7c5aa6642fa26641ebf286966a165aec71c91991.zip
op-kernel-dev-7c5aa6642fa26641ebf286966a165aec71c91991.tar.gz
ACPI: Kconfig: always enable CONFIG_ACPI_SLEEP on X86
The SMP dependency on HOTPLUG_CPU and SUSPEND_SMP caused more harm than good -- making ACPI sleep support vanish for configs missing those options. So simply select them on the (ACPI && SMP && X86) systems that need them. Also, remove the prompt for ACPI_SLEEP, virtually nobody (intentionally) enables ACPI without it. Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/Kconfig21
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index efd47ee..524cbf15 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,24 +43,11 @@ menuconfig ACPI
if ACPI
config ACPI_SLEEP
- bool "Sleep States"
- depends on X86 && (!SMP || SUSPEND_SMP)
+ bool
+ depends on X86
+ select HOTPLUG_CPU if SMP
+ select SUSPEND_SMP if SMP
default y
- ---help---
- This option adds support for ACPI suspend states.
-
- With this option, you will be able to put the system "to sleep".
- Sleep states are low power states for the system and devices. All
- of the system operating state is saved to either memory or disk
- (depending on the state), to allow the system to resume operation
- quickly at your request.
-
- Although this option sounds really nifty, barely any of the device
- drivers have been converted to the new driver model and hence few
- have proper power management support.
-
- This option is not recommended for anyone except those doing driver
- power management development.
config ACPI_PROCFS
bool "Deprecated /proc/acpi files"
OpenPOWER on IntegriCloud