diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 17:42:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 17:42:14 -0700 |
| commit | 61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb (patch) | |
| tree | 2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2 /arch/powerpc/platforms | |
| parent | 77aa56ba09b7416764aec2e3f7b41e023cf30602 (diff) | |
| parent | bdce2595a2f539c6fdedd8f2bd281326b627bba3 (diff) | |
| download | kernel_samsung_smdk4412-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.zip kernel_samsung_smdk4412-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.tar.gz kernel_samsung_smdk4412-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.tar.bz2 | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] pcc-cpufreq: remove duplicate statements
[CPUFREQ] Remove the pm_message_t argument from driver suspend
[CPUFREQ] Remove unneeded locks
[CPUFREQ] Remove old, deprecated per cpu ondemand/conservative sysfs files
[CPUFREQ] Remove deprecated sysfs file sampling_rate_max
[CPUFREQ] powernow-k8: The table index is not worth displaying
[CPUFREQ] calculate delay after dbs_check_cpu
[CPUFREQ] Add documentation for sampling_down_factor
[CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c index 415ca6d..04af5f4 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_32.c +++ b/arch/powerpc/platforms/powermac/cpufreq_32.c @@ -429,7 +429,7 @@ static u32 read_gpio(struct device_node *np) return offset; } -static int pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg) +static int pmac_cpufreq_suspend(struct cpufreq_policy *policy) { /* Ok, this could be made a bit smarter, but let's be robust for now. We * always force a speed change to high speed before sleep, to make sure |