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

[cascardo/linux.git] / drivers / cpufreq / Kconfig

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 6b8cde5..4b029c0 100644 (file)
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -20,6 +20,10 @@ if CPU_FREQ
 config CPU_FREQ_GOV_COMMON
        bool
 
+config CPU_FREQ_BOOST_SW
+       bool
+       depends on THERMAL
+
 config CPU_FREQ_STAT
        tristate "CPU frequency translation statistics"
        default y
@@ -181,7 +185,8 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config GENERIC_CPUFREQ_CPU0
        tristate "Generic CPU0 cpufreq driver"
-       depends on HAVE_CLK && REGULATOR && PM_OPP && OF && THERMAL && CPU_THERMAL
+       depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
+       select PM_OPP
        help
          This adds a generic cpufreq driver for CPU0 frequency management.
          It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)