diff options
| author | Rafael J. Wysocki <rjw@rjwysocki.net> | 2013-10-25 16:36:40 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@rjwysocki.net> | 2013-10-25 16:36:40 -0400 |
| commit | 6ddee424fea2d269c2f402278d93165c7b92dc58 (patch) | |
| tree | c1b1d0d9058846a6da22def648dea61e16faacd0 /drivers/thermal/Kconfig | |
| parent | e4db1c7439b31993a4886b273bb9235a8eea82bf (diff) | |
| parent | a814613b9a32d9ab9578d9dab396265c826d37f0 (diff) | |
Merge back earlier 'pm-cpufreq' material.
Conflicts:
drivers/cpufreq/omap-cpufreq.c
Diffstat (limited to 'drivers/thermal/Kconfig')
| -rw-r--r-- | drivers/thermal/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index dbfc390330ac..5ef596765060 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig | |||
| @@ -78,7 +78,6 @@ config THERMAL_GOV_USER_SPACE | |||
| 78 | config CPU_THERMAL | 78 | config CPU_THERMAL |
| 79 | bool "generic cpu cooling support" | 79 | bool "generic cpu cooling support" |
| 80 | depends on CPU_FREQ | 80 | depends on CPU_FREQ |
| 81 | select CPU_FREQ_TABLE | ||
| 82 | help | 81 | help |
| 83 | This implements the generic cpu cooling mechanism through frequency | 82 | This implements the generic cpu cooling mechanism through frequency |
| 84 | reduction. An ACPI version of this already exists | 83 | reduction. An ACPI version of this already exists |