Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / include / linux / sysdev.h

diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index 635db1df656f3442c07023df76b6c5bc3f180a54..2a4b432e117645cf749782a218afc8c32fdf7262 100644 (file)
--- 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 *);
 };