summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 17:42:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 17:42:14 -0700
commit61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb (patch)
tree2c6b7a4357ba85f7be027bd492da9bf8d7c6acb2 /arch/arm/mach-s5pv210
parent77aa56ba09b7416764aec2e3f7b41e023cf30602 (diff)
parentbdce2595a2f539c6fdedd8f2bd281326b627bba3 (diff)
downloadop-kernel-dev-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.zip
op-kernel-dev-61ef46fd45c3c62dc7c880a45dd2aa841b9af8fb.tar.gz
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/cpufreq.c b/arch/arm/mach-s5pv210/cpufreq.c
index a6f2292..22046e2 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,
}
#ifdef CONFIG_PM
-static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy,
- pm_message_t pmsg)
+static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy)
{
return 0;
}
OpenPOWER on IntegriCloud