From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 16 Apr 2005 22:25:38 +0000 (-0700)
Subject: [PATCH] fix few remaining u32 vs. pm_message_t problems
X-Git-Tag: v2.6.12-rc3~124
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bf2049f983eb47f9463d3dd54abd82e3e58846f9;p=~emulex%2Finfiniband.git

[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>
---

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index aefc0c1a862..fdea1a3a631 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2371,7 +2371,7 @@ pmac_suspend_devices(void)
 	 * use this but still... This will take care of sysdev's as well, so
 	 * we exit from here with local irqs disabled and PIC off.
 	 */
-	ret = device_power_down(PM_SUSPEND_MEM);
+	ret = device_power_down(PMSG_SUSPEND);
 	if (ret) {
 		wakeup_decrementer();
 		local_irq_enable();