Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

diff --cc drivers/thermal/Kconfig
index d1fd2e5d25e296e0355a0bb296292d8b42ae27c6,462d0149460d7d8be991e46b01708d831d125f4d..c37eedc35a240d0d3fe4387698f50e7884e52cfc
--- 1/drivers/thermal/Kconfig
--- 2/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -372,9 -365,17 +372,18 @@@ config INTEL_PCH_THERMA
          Thermal reporting device will provide temperature reading,
          programmable trip points and other information.
  
+ config MTK_THERMAL
+       tristate "Temperature sensor driver for mediatek SoCs"
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       depends on HAS_IOMEM
+       default y
+       help
+         Enable this option if you want to have support for thermal management
+         controller present in Mediatek SoCs
+ 
  menu "Texas Instruments thermal drivers"
  depends on ARCH_HAS_BANDGAP || COMPILE_TEST
 +depends on HAS_IOMEM
  source "drivers/thermal/ti-soc-thermal/Kconfig"
  endmenu