summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/us3_cpufreq.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 06:52:04 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 06:52:04 +0200
commita02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch)
treebf1f6467978ec63a22f42299ecac2ee7f7e73336 /arch/sparc64/kernel/us3_cpufreq.c
parentMerge commit 'kumar/kumar-for-2.6.28' (diff)
parentbinfmt_elf_fdpic: Update for cputime changes. (diff)
downloadlinux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.xz
linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.zip
Merge commit 'origin' into master
Manual merge of: arch/powerpc/Kconfig arch/powerpc/include/asm/page.h
Diffstat (limited to 'arch/sparc64/kernel/us3_cpufreq.c')
-rw-r--r--arch/sparc64/kernel/us3_cpufreq.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c
index 47e3acafb5be..365b6464e2ce 100644
--- a/arch/sparc64/kernel/us3_cpufreq.c
+++ b/arch/sparc64/kernel/us3_cpufreq.c
@@ -183,7 +183,6 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
table[3].index = 0;
table[3].frequency = CPUFREQ_TABLE_END;
- policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
policy->cpuinfo.transition_latency = 0;
policy->cur = clock_tick;