[PATCH] pm_message_t: more fixes in common and i386

I thought I'm done with fixing u32 vs.  pm_message_t ...  unfortunately
that turned out not to be the case as Russel King pointed out.  Here are
fixes for Documentation and common code (mainly system devices).

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index 635db1df65..2a4b432e11 100644
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
@@ -22,6 +22,7 @@
 #define _SYSDEV_H_
 
 #include <linux/kobject.h>
+#include <linux/pm.h>
 
 
 struct sys_device;
@@ -31,7 +32,7 @@ struct sysdev_class {
 
         /* Default operations for these types of devices */
         int     (*shutdown)(struct sys_device *);
-        int     (*suspend)(struct sys_device *, u32 state);
+        int     (*suspend)(struct sys_device *, pm_message_t state);
         int     (*resume)(struct sys_device *);
         struct kset             kset;
 };
@@ -50,7 +51,7 @@ struct sysdev_driver {
         int     (*add)(struct sys_device *);
         int     (*remove)(struct sys_device *);
         int     (*shutdown)(struct sys_device *);
-        int     (*suspend)(struct sys_device *, u32 state);
+        int     (*suspend)(struct sys_device *, pm_message_t state);
         int     (*resume)(struct sys_device *);
 };