diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-05 00:31:42 -0400 |
| commit | 1d492eb41371d9a5145651e8eb64bea1042a4057 (patch) | |
| tree | 2a66a8fd347cf8dd8a665c4575b30d873035a5a4 /drivers/acpi/Kconfig | |
| parent | 5d2a22079c825669d91a3a200332f1053b4b61b0 (diff) | |
| parent | cbfc1bae55bbd053308ef0fa6b6448cd1ddf3e67 (diff) | |
[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index ba13896cae40..66c60982ba46 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -154,12 +154,10 @@ config ACPI_PROCESSOR | |||
| 154 | support it. | 154 | support it. |
| 155 | 155 | ||
| 156 | config ACPI_HOTPLUG_CPU | 156 | config ACPI_HOTPLUG_CPU |
| 157 | bool "Processor Hotplug (EXPERIMENTAL)" | 157 | bool |
| 158 | depends on ACPI_PROCESSOR && HOTPLUG_CPU && EXPERIMENTAL | 158 | depends on ACPI_PROCESSOR && HOTPLUG_CPU |
| 159 | select ACPI_CONTAINER | 159 | select ACPI_CONTAINER |
| 160 | default n | 160 | default y |
| 161 | ---help--- | ||
| 162 | Select this option if your platform support physical CPU hotplug. | ||
| 163 | 161 | ||
| 164 | config ACPI_THERMAL | 162 | config ACPI_THERMAL |
| 165 | tristate "Thermal Zone" | 163 | tristate "Thermal Zone" |