diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 20:42:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 20:42:14 -0400 |
| commit | 61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb (patch) | |
| tree | 2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2 /arch/arm/mach-s5pv210 | |
| parent | 77aa56ba09b7416764aec2e3f7b41e023cf30602 (diff) | |
| parent | bdce2595a2f539c6fdedd8f2bd281326b627bba3 (diff) | |
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/arm/mach-s5pv210')
| -rw-r--r-- | arch/arm/mach-s5pv210/cpufreq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/cpufreq.c b/arch/arm/mach-s5pv210/cpufreq.c index a6f22920a2c2..22046e2f53c2 100644 --- a/arch/arm/mach-s5pv210/cpufreq.c +++ b/arch/arm/mach-s5pv210/cpufreq.c | |||
| @@ -390,8 +390,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, | |||
| 390 | } | 390 | } |
| 391 | 391 | ||
| 392 | #ifdef CONFIG_PM | 392 | #ifdef CONFIG_PM |
| 393 | static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy, | 393 | static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy) |
| 394 | pm_message_t pmsg) | ||
| 395 | { | 394 | { |
| 396 | return 0; | 395 | return 0; |
| 397 | } | 396 | } |