summaryrefslogtreecommitdiff
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-26 14:51:00 -0400
committerLen Brown <len.brown@intel.com>2010-10-26 14:51:00 -0400
commit7e31842441776b4d6ec7fd916c91663ad05b7814 (patch)
tree8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /drivers/acpi/Kconfig
parent1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff)
parentb1d248d96c71665c79befb81207f38f894c7c082 (diff)
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 0f9de2b44c0c..3f3489c5ca8c 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -9,7 +9,6 @@ menuconfig ACPI
depends on PCI
depends on PM
select PNP
- select CPU_IDLE
default y
help
Advanced Configuration and Power Interface (ACPI) support for
@@ -200,6 +199,7 @@ config ACPI_DOCK
config ACPI_PROCESSOR
tristate "Processor"
select THERMAL
+ select CPU_IDLE
default y
help
This driver installs ACPI as the idle handler for Linux and uses