diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /drivers/acpi/Kconfig | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
Merge branch 'fix/misc' into topic/misc
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 0ed42d8870c..93d2c7971df 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" |