diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
| commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
| tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /drivers/acpi/Kconfig | |
| parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
| parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 2 |
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 | |||
| 9 | depends on PCI | 9 | depends on PCI |
| 10 | depends on PM | 10 | depends on PM |
| 11 | select PNP | 11 | select PNP |
| 12 | select CPU_IDLE | ||
| 13 | default y | 12 | default y |
| 14 | help | 13 | help |
| 15 | Advanced Configuration and Power Interface (ACPI) support for | 14 | Advanced Configuration and Power Interface (ACPI) support for |
| @@ -200,6 +199,7 @@ config ACPI_DOCK | |||
| 200 | config ACPI_PROCESSOR | 199 | config ACPI_PROCESSOR |
| 201 | tristate "Processor" | 200 | tristate "Processor" |
| 202 | select THERMAL | 201 | select THERMAL |
| 202 | select CPU_IDLE | ||
| 203 | default y | 203 | default y |
| 204 | help | 204 | help |
| 205 | This driver installs ACPI as the idle handler for Linux and uses | 205 | This driver installs ACPI as the idle handler for Linux and uses |