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/sparc64 | |
| 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/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/us2e_cpufreq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/us2e_cpufreq.c b/arch/sparc64/kernel/us2e_cpufreq.c index 1f83fe6a82d6..791c15138f3a 100644 --- a/arch/sparc64/kernel/us2e_cpufreq.c +++ b/arch/sparc64/kernel/us2e_cpufreq.c | |||
| @@ -326,7 +326,6 @@ static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy) | |||
| 326 | table[2].index = 5; | 326 | table[2].index = 5; |
| 327 | table[3].frequency = CPUFREQ_TABLE_END; | 327 | table[3].frequency = CPUFREQ_TABLE_END; |
| 328 | 328 | ||
| 329 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
| 330 | policy->cpuinfo.transition_latency = 0; | 329 | policy->cpuinfo.transition_latency = 0; |
| 331 | policy->cur = clock_tick; | 330 | policy->cur = clock_tick; |
| 332 | 331 | ||