Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve...

[firefly-linux-kernel-4.4.55.git] / drivers / cpufreq / Kconfig

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index ffe350f86bca570e879177c63395efff5de6587d..3489f8f5fadabee1b8db494c7b5dbd996bd70e33 100644 (file)
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -183,14 +183,14 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
          If in doubt, say N.
 
 
          If in doubt, say N.
 

-config GENERIC_CPUFREQ_CPU0
-       tristate "Generic CPU0 cpufreq driver"
+config CPUFREQ_DT
+       tristate "Generic DT based cpufreq driver"

        depends on HAVE_CLK && OF
        depends on HAVE_CLK && OF

-       # if CPU_THERMAL is on and THERMAL=m, CPU0 cannot be =y:
+       # if CPU_THERMAL is on and THERMAL=m, CPUFREQ_DT cannot be =y:

        depends on !CPU_THERMAL || THERMAL
        select PM_OPP
        help
        depends on !CPU_THERMAL || THERMAL
        select PM_OPP
        help

-         This adds a generic cpufreq driver for CPU0 frequency management.
+         This adds a generic DT based cpufreq driver for frequency management.

          It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
          systems which share clock and voltage across all CPUs.
 
          It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
          systems which share clock and voltage across all CPUs.