aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:38 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:38 -0400
commitbf2049f983eb47f9463d3dd54abd82e3e58846f9 (patch)
tree99b6f13374bd05c39710ead54bc7d7d6ed7c5f0c /drivers
parent3bfffd97ef913045080861d1898286ac8975c22a (diff)
[PATCH] fix few remaining u32 vs. pm_message_t problems
This fixes remaining u32 vs. pm_message_t confusions in -rc2-mm3. [There are usb changes, too; they went to Greg on his request.] Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/macintosh/via-pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index aefc0c1a862c..fdea1a3a631d 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2371,7 +2371,7 @@ pmac_suspend_devices(void)
2371 * use this but still... This will take care of sysdev's as well, so 2371 * use this but still... This will take care of sysdev's as well, so
2372 * we exit from here with local irqs disabled and PIC off. 2372 * we exit from here with local irqs disabled and PIC off.
2373 */ 2373 */
2374 ret = device_power_down(PM_SUSPEND_MEM); 2374 ret = device_power_down(PMSG_SUSPEND);
2375 if (ret) { 2375 if (ret) {
2376 wakeup_decrementer(); 2376 wakeup_decrementer();
2377 local_irq_enable(); 2377 local_irq_enable();