diff options
| author | Bernard Blackham <bernard@blackham.com.au> | 2005-07-07 20:56:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:43 -0400 |
| commit | e00d9967e3addea86dded46deefc5daec5d52e5a (patch) | |
| tree | bd6f4fba60ac6173f6e8e4a61461c74c06e3fc9a /arch | |
| parent | 2a569579be87b5ba61f9b6c54fd5f9f307c53962 (diff) | |
[PATCH] pm: fix u32 vs. pm_message_t confusion in cpufreq
Fix u32 vs pm_message_t confusion in cpufreq.
Signed-off-by: Bernard Blackham <bernard@blackham.com.au>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/platforms/pmac_cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/pmac_cpufreq.c b/arch/ppc/platforms/pmac_cpufreq.c index 5fdd4f607a40..c0605244edda 100644 --- a/arch/ppc/platforms/pmac_cpufreq.c +++ b/arch/ppc/platforms/pmac_cpufreq.c | |||
| @@ -452,7 +452,7 @@ static u32 __pmac read_gpio(struct device_node *np) | |||
| 452 | return offset; | 452 | return offset; |
| 453 | } | 453 | } |
| 454 | 454 | ||
| 455 | static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, u32 state) | 455 | static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg) |
| 456 | { | 456 | { |
| 457 | /* Ok, this could be made a bit smarter, but let's be robust for now. We | 457 | /* Ok, this could be made a bit smarter, but let's be robust for now. We |
| 458 | * always force a speed change to high speed before sleep, to make sure | 458 | * always force a speed change to high speed before sleep, to make sure |