diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-09 16:28:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-09 16:28:09 -0700 |
commit | 5d44f4b3484e85c8d4527ecaca5e536da774ae21 (patch) | |
tree | 5c699fd097844ecdf30ef9b47444064d713ac410 /drivers/thermal/samsung/Kconfig | |
parent | toshiba laptop: replace ioremap_cache with ioremap (diff) | |
parent | Linux 4.2-rc6 (diff) | |
download | linux-dev-5d44f4b3484e85c8d4527ecaca5e536da774ae21.tar.xz linux-dev-5d44f4b3484e85c8d4527ecaca5e536da774ae21.zip |
Merge 4.2-rc6 into char-misc-next
We want the fixes in Linus's tree in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thermal/samsung/Kconfig')
-rw-r--r-- | drivers/thermal/samsung/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/samsung/Kconfig b/drivers/thermal/samsung/Kconfig index c8e35c1a43dc..e0da3865e060 100644 --- a/drivers/thermal/samsung/Kconfig +++ b/drivers/thermal/samsung/Kconfig @@ -1,6 +1,6 @@ config EXYNOS_THERMAL tristate "Exynos thermal management unit driver" - depends on OF + depends on THERMAL_OF help If you say yes here you get support for the TMU (Thermal Management Unit) driver for SAMSUNG EXYNOS series of SoCs. This driver initialises |