diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 18:42:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 18:42:01 -0400 |
| commit | 4d5709a7b7d54fc5882d2943a14988a92d48c00a (patch) | |
| tree | 1415777e91045e2c890b6960a597eb0e8c183442 /arch/arm/mach-imx | |
| parent | 57c5b9998ea05a90ebacaa13c45f985ffe09dbe9 (diff) | |
| parent | 9eb59573d4b86f347e6cd04f47a4c2082009fa58 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Don't take semaphore in cpufreq_quick_get()
[CPUFREQ] Support different families in fid/did to frequency conversion
[CPUFREQ] cpufreq_stats: misc cpuinit section annotations
[CPUFREQ] implement !CONFIG_CPU_FREQ stub for cpufreq_unregister_notifier()
[CPUFREQ] mark hotplug notifier callback as __cpuinit
[CPUFREQ] Only check for transition latency on problematic governors (kconfig fix)
[CPUFREQ] allow ondemand and conservative cpufreq governors to be used as default
[CPUFREQ] move policy's governor initialisation out of low-level drivers into cpufreq core
[CPUFREQ] Longhaul - Add support for PM133 northbridge
[CPUFREQ] x86: use num_online_nodes to get physical cpus numbers for
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/cpufreq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c index 467d899fbe75..e548ba74a4d2 100644 --- a/arch/arm/mach-imx/cpufreq.c +++ b/arch/arm/mach-imx/cpufreq.c | |||
| @@ -269,7 +269,6 @@ static int __init imx_cpufreq_driver_init(struct cpufreq_policy *policy) | |||
| 269 | return -EINVAL; | 269 | return -EINVAL; |
| 270 | 270 | ||
| 271 | policy->cur = policy->min = policy->max = imx_get_speed(0); | 271 | policy->cur = policy->min = policy->max = imx_get_speed(0); |
| 272 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
| 273 | policy->cpuinfo.min_freq = 8000; | 272 | policy->cpuinfo.min_freq = 8000; |
| 274 | policy->cpuinfo.max_freq = 200000; | 273 | policy->cpuinfo.max_freq = 200000; |
| 275 | /* Manual states, that PLL stabilizes in two CLK32 periods */ | 274 | /* Manual states, that PLL stabilizes in two CLK32 periods */ |