Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

[mirror_ubuntu-bionic-kernel.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 07002df4f83acdde2efdf3f51299976ef25d2e1e..315ae2926e20fae31f2ab6eb7681870c181656c8 100644 (file)
--- 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
@@ -408,7 +409,7 @@ config MTK_THERMAL
          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