diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:24 -0700 |
| commit | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch) | |
| tree | 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /include/linux/sysdev.h | |
| parent | 74ad74c1581c9a27582945ca01ffdb88fc774171 (diff) | |
| download | op-kernel-dev-438510f6f079e94df294936b5bd8a7fd679cd1c9.zip op-kernel-dev-438510f6f079e94df294936b5bd8a7fd679cd1c9.tar.gz | |
[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>
Diffstat (limited to 'include/linux/sysdev.h')
| -rw-r--r-- | include/linux/sysdev.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h index 635db1d..2a4b432 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 *); }; |
