diff options
| author | Len Brown <len.brown@intel.com> | 2009-10-15 00:47:13 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-10-15 00:47:13 -0400 |
| commit | d59733c1e56784a99381799021c4f9698f3e6379 (patch) | |
| tree | eee7c84624df2aedeefc9c6eef9577f4ef6d4da5 /drivers/acpi/Kconfig | |
| parent | 4697fd6f6a6277b33093fc807786f16cabe30b31 (diff) | |
| parent | 2c907b72db4dd4e8af6dccb6e0ac122d78627b8d (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 0ed42d8870c7..93d2c7971df6 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -218,10 +218,10 @@ config ACPI_PROCESSOR_AGGREGATOR | |||
| 218 | depends on X86 | 218 | depends on X86 |
| 219 | help | 219 | help |
| 220 | ACPI 4.0 defines processor Aggregator, which enables OS to perform | 220 | ACPI 4.0 defines processor Aggregator, which enables OS to perform |
| 221 | specfic processor configuration and control that applies to all | 221 | specific processor configuration and control that applies to all |
| 222 | processors in the platform. Currently only logical processor idling | 222 | processors in the platform. Currently only logical processor idling |
| 223 | is defined, which is to reduce power consumption. This driver | 223 | is defined, which is to reduce power consumption. This driver |
| 224 | support the new device. | 224 | supports the new device. |
| 225 | 225 | ||
| 226 | config ACPI_THERMAL | 226 | config ACPI_THERMAL |
| 227 | tristate "Thermal Zone" | 227 | tristate "Thermal Zone" |