From: Zhang Rui <rui.zhang@intel.com>
Date: Mon, 14 Mar 2016 23:53:01 +0000 (+0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=032f4a1e5a307c63b5ac27298ea82eb328f40ccc;p=linux-beck.git

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
---

032f4a1e5a307c63b5ac27298ea82eb328f40ccc
diff --cc drivers/thermal/Kconfig
index d1fd2e5d25e2,462d0149460d..c37eedc35a24
--- a/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