diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /arch/cris/arch-v32/mach-a3/cpufreq.c | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'arch/cris/arch-v32/mach-a3/cpufreq.c')
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/cpufreq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-a3/cpufreq.c b/arch/cris/arch-v32/mach-a3/cpufreq.c index 8e5a3cab8ad7..ee391ecb5bc9 100644 --- a/arch/cris/arch-v32/mach-a3/cpufreq.c +++ b/arch/cris/arch-v32/mach-a3/cpufreq.c | |||
| @@ -85,7 +85,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) | |||
| 85 | int result; | 85 | int result; |
| 86 | 86 | ||
| 87 | /* cpuinfo and default policy values */ | 87 | /* cpuinfo and default policy values */ |
| 88 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
| 89 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ | 88 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ |
| 90 | policy->cur = cris_freq_get_cpu_frequency(0); | 89 | policy->cur = cris_freq_get_cpu_frequency(0); |
| 91 | 90 | ||