diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-21 11:39:21 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-21 11:39:21 -0500 |
commit | 4510dbe324876f2f2f3dc9931e97ec0e98f1ee26 (patch) | |
tree | d42a8ff24b82e0c6b01756b3f2c33756fc30fc17 /drivers/cpufreq/Kconfig | |
parent | b296263398f08d21e68d5d7b2afc43228c208b71 (diff) | |
parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
download | linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.tar.gz linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.tar.bz2 linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.zip |
Merge tag 'v3.10-rc2' into asoc-ux500
Linux 3.10-rc2
Diffstat (limited to 'drivers/cpufreq/Kconfig')
-rw-r--r-- | drivers/cpufreq/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index a1488f58f6ca..534fcb825153 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -47,7 +47,7 @@ config CPU_FREQ_STAT_DETAILS choice prompt "Default CPUFreq governor" - default CPU_FREQ_DEFAULT_GOV_USERSPACE if CPU_FREQ_SA1100 || CPU_FREQ_SA1110 + default CPU_FREQ_DEFAULT_GOV_USERSPACE if ARM_SA1100_CPUFREQ || ARM_SA1110_CPUFREQ default CPU_FREQ_DEFAULT_GOV_PERFORMANCE help This option sets which CPUFreq governor shall be loaded at |