Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux-2.6-block.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 4edc011fe4a5fe45718c033b051ef262c6db6c9a..b5b5facb87473e4de8c30fa29a105251965cd027 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -308,18 +308,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 DA9062_THERMAL
        tristate "DA9062/DA9061 Dialog Semiconductor thermal driver"
        depends on MFD_DA9062 || COMPILE_TEST
@@ -392,7 +380,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.