diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-10-25 19:20:36 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-10-25 19:20:36 (GMT) |
commit | c64064ce9376a404e0888ca4a2985c8a4c16cec3 (patch) | |
tree | f34d3b84ca970fdb381dad9a195c1367ce5d10f4 /drivers/thermal/Kconfig | |
parent | 21b3de881b38a84002c07b1b4bfb91892644e83f (diff) | |
parent | 456ba5a7802e58eccb5aa9751b3ab515ef99b9ca (diff) | |
download | linux-fsl-qoriq-c64064ce9376a404e0888ca4a2985c8a4c16cec3.tar.xz |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A couple of driver fixes, one that improves the interoperability of
WM8994 with controllers that are sensitive to extra BCLK cycles and some
build break fixes for ux500.
Diffstat (limited to 'drivers/thermal/Kconfig')
-rw-r--r-- | drivers/thermal/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index edfd67d..e1cb6bd 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -22,6 +22,7 @@ config THERMAL_HWMON config CPU_THERMAL bool "generic cpu cooling support" depends on THERMAL && CPU_FREQ + select CPU_FREQ_TABLE help This implements the generic cpu cooling mechanism through frequency reduction, cpu hotplug and any other ways of reducing temperature. An @@ -50,6 +51,7 @@ config RCAR_THERMAL config EXYNOS_THERMAL tristate "Temperature sensor on Samsung EXYNOS" depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL + select CPU_FREQ_TABLE help If you say yes here you get support for TMU (Thermal Managment Unit) on SAMSUNG EXYNOS series of SoC. |