Commit bf2049f9 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[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: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3bfffd97
...@@ -2371,7 +2371,7 @@ pmac_suspend_devices(void) ...@@ -2371,7 +2371,7 @@ pmac_suspend_devices(void)
* use this but still... This will take care of sysdev's as well, so * 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. * 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) { if (ret) {
wakeup_decrementer(); wakeup_decrementer();
local_irq_enable(); local_irq_enable();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment