diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-09-03 15:56:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:06:15 -0700 |
| commit | 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch) | |
| tree | 044087fb18aa4b5f5bbd233f54f9eec3439ad6de /arch/ppc | |
| parent | 7e958883bced7e435f5a76349e15684858d3477c (diff) | |
| download | kernel_samsung_smdk4412-829ca9a30a2ddb727981d80fabdbff2ea86bc9ea.zip kernel_samsung_smdk4412-829ca9a30a2ddb727981d80fabdbff2ea86bc9ea.tar.gz kernel_samsung_smdk4412-829ca9a30a2ddb727981d80fabdbff2ea86bc9ea.tar.bz2 | |
[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion
Fix remaining bits of u32 vs. pm_message confusion. Should not break
anything.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/platforms/pmac_pic.c | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/open_pic.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/pmac_pic.c b/arch/ppc/platforms/pmac_pic.c index 9f92e1b..2ce0588 100644 --- a/arch/ppc/platforms/pmac_pic.c +++ b/arch/ppc/platforms/pmac_pic.c @@ -619,7 +619,7 @@ not_found: return viaint; } -static int pmacpic_suspend(struct sys_device *sysdev, u32 state) +static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state) { int viaint = pmacpic_find_viaint(); diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c index ad39b86..53da585 100644 --- a/arch/ppc/syslib/open_pic.c +++ b/arch/ppc/syslib/open_pic.c @@ -948,7 +948,7 @@ static void openpic_cached_disable_irq(u_int irq) * we need something better to deal with that... Maybe switch to S1 for * cpufreq changes */ -int openpic_suspend(struct sys_device *sysdev, u32 state) +int openpic_suspend(struct sys_device *sysdev, pm_message_t state) { int i; unsigned long flags; |