diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2017-11-02 09:31:52 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-11-02 09:31:52 +0100 |
| commit | fe9ba5bc73af01f7d53bb6b2b31204f799dd09be (patch) | |
| tree | ad68935d28d4616eefdefb95b4e10d3d85f11b29 /drivers/thermal/Kconfig | |
| parent | thermal: cpu_cooling: pr_err() strings should end with newlines (diff) | |
| parent | thermal: imx: add NVMEM dependency (diff) | |
| download | linux-fe9ba5bc73af01f7d53bb6b2b31204f799dd09be.tar.xz linux-fe9ba5bc73af01f7d53bb6b2b31204f799dd09be.zip | |
Merge branch 'imx-nvmem' into thermal-soc
Diffstat (limited to 'drivers/thermal/Kconfig')
| -rw-r--r-- | drivers/thermal/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index c70f6bfd9e85..315ae2926e20 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -206,6 +206,7 @@ config HISI_THERMAL 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 |