diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /arch/blackfin/mach-common/cpufreq.c | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'arch/blackfin/mach-common/cpufreq.c')
| -rw-r--r-- | arch/blackfin/mach-common/cpufreq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c index 75cdad291e88..c22c47b60127 100644 --- a/arch/blackfin/mach-common/cpufreq.c +++ b/arch/blackfin/mach-common/cpufreq.c | |||
| @@ -158,8 +158,6 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy) | |||
| 158 | dpm_state_table[index].tscale); | 158 | dpm_state_table[index].tscale); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
| 162 | |||
| 163 | policy->cpuinfo.transition_latency = (bfin_read_PLL_LOCKCNT() / (sclk / 1000000)) * 1000; | 161 | policy->cpuinfo.transition_latency = (bfin_read_PLL_LOCKCNT() / (sclk / 1000000)) * 1000; |
| 164 | /*Now ,only support one cpu */ | 162 | /*Now ,only support one cpu */ |
| 165 | policy->cur = cclk; | 163 | policy->cur = cclk; |