From: Zhang Rui <rui.zhang@intel.com>
Date: Thu, 2 Nov 2017 08:31:52 +0000 (+0800)
Subject: Merge branch 'imx-nvmem' into thermal-soc
X-Git-Tag: v4.19~2141^2^4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe9ba5bc73af01f7d53bb6b2b31204f799dd09be;hp=-c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'imx-nvmem' into thermal-soc
---

fe9ba5bc73af01f7d53bb6b2b31204f799dd09be
diff --combined drivers/thermal/Kconfig
index c70f6bfd9e85,cb14f1ec5953..315ae2926e20
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -206,6 -206,7 +206,7 @@@ config HISI_THERMA
  config IMX_THERMAL
  	tristate "Temperature sensor driver for Freescale i.MX SoCs"
  	depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST
+ 	depends on NVMEM || !NVMEM
  	depends on MFD_SYSCON
  	depends on OF
  	help
@@@ -408,7 -409,7 +409,7 @@@ config MTK_THERMA
  	  controller present in Mediatek SoCs
  
  menu "Broadcom thermal drivers"
 -depends on ARCH_BCM || COMPILE_TEST
 +depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
  source "drivers/thermal/broadcom/Kconfig"
  endmenu