diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-04 23:10:47 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-04 23:10:47 +0100 |
commit | f3ea36aa87400baafd17d548a873de5fe1ecdfcd (patch) | |
tree | 1966f6b5b6786a58605ccd283cad29f8fd8c6b67 /drivers/cpufreq/Kconfig | |
parent | 3eef2455f350708269fe42fab07b8c73efca83dc (diff) | |
parent | 1e15f295408e21873dba5fdf17efcbd05fcb6729 (diff) |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq / governor: Fix problem with cpufreq_ondemand or cpufreq_conservative
cpufreq / Longhaul: Disable driver by default
cpufreq / stats: fix race between stats allocation and first usage
Diffstat (limited to 'drivers/cpufreq/Kconfig')
-rw-r--r-- | drivers/cpufreq/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index ea512f47b78..e0a899f25e3 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -20,6 +20,9 @@ if CPU_FREQ config CPU_FREQ_TABLE tristate +config CPU_FREQ_GOV_COMMON + bool + config CPU_FREQ_STAT tristate "CPU frequency translation statistics" select CPU_FREQ_TABLE @@ -141,6 +144,7 @@ config CPU_FREQ_GOV_USERSPACE config CPU_FREQ_GOV_ONDEMAND tristate "'ondemand' cpufreq policy governor" select CPU_FREQ_TABLE + select CPU_FREQ_GOV_COMMON help 'ondemand' - This driver adds a dynamic cpufreq policy governor. The governor does a periodic polling and @@ -159,6 +163,7 @@ config CPU_FREQ_GOV_ONDEMAND config CPU_FREQ_GOV_CONSERVATIVE tristate "'conservative' cpufreq governor" depends on CPU_FREQ + select CPU_FREQ_GOV_COMMON help 'conservative' - this driver is rather similar to the 'ondemand' governor both in its source code and its purpose, the difference is |