diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-09-03 18:56:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:15 -0400 |
commit | 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch) | |
tree | 044087fb18aa4b5f5bbd233f54f9eec3439ad6de /arch/ppc | |
parent | 7e958883bced7e435f5a76349e15684858d3477c (diff) |
[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 9f92e1bb7f34..2ce058895e03 100644 --- a/arch/ppc/platforms/pmac_pic.c +++ b/arch/ppc/platforms/pmac_pic.c | |||
@@ -619,7 +619,7 @@ not_found: | |||
619 | return viaint; | 619 | return viaint; |
620 | } | 620 | } |
621 | 621 | ||
622 | static int pmacpic_suspend(struct sys_device *sysdev, u32 state) | 622 | static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state) |
623 | { | 623 | { |
624 | int viaint = pmacpic_find_viaint(); | 624 | int viaint = pmacpic_find_viaint(); |
625 | 625 | ||
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c index ad39b86ca92c..53da58523e39 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) | |||
948 | * we need something better to deal with that... Maybe switch to S1 for | 948 | * we need something better to deal with that... Maybe switch to S1 for |
949 | * cpufreq changes | 949 | * cpufreq changes |
950 | */ | 950 | */ |
951 | int openpic_suspend(struct sys_device *sysdev, u32 state) | 951 | int openpic_suspend(struct sys_device *sysdev, pm_message_t state) |
952 | { | 952 | { |
953 | int i; | 953 | int i; |
954 | unsigned long flags; | 954 | unsigned long flags; |