Merge branch 'stable/for-jens-4.12' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 776b34396144a4612ec5ebfff5a549be9f6e33ca..6871ecc5b9512553368920272910f69c6493ecdd 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -291,18 +291,6 @@ config ARMADA_THERMAL
          Enable this option if you want to have support for thermal management
          controller present in Armada 370 and Armada XP SoC.
 
-config DB8500_CPUFREQ_COOLING
-       tristate "DB8500 cpufreq cooling"
-       depends on ARCH_U8500 || COMPILE_TEST
-       depends on HAS_IOMEM
-       depends on CPU_THERMAL
-       default y
-       help
-         Adds DB8500 cpufreq cooling devices, and these cooling devices can be
-         bound to thermal zone trip points. When a trip point reached, the
-         bound cpufreq cooling device turns active to set CPU frequency low to
-         cool down the CPU.
-
 config INTEL_POWERCLAMP
        tristate "Intel PowerClamp idle injection driver"
        depends on THERMAL
@@ -365,7 +353,7 @@ endmenu
 
 config INTEL_BXT_PMIC_THERMAL
        tristate "Intel Broxton PMIC thermal driver"
-       depends on X86 && INTEL_SOC_PMIC && REGMAP
+       depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP
        help
          Select this driver for Intel Broxton PMIC with ADC channels monitoring
          system temperature measurements and alerts.