diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:34 -0400 |
commit | b1c42851b006398dda77a068275e8741e33761f1 (patch) | |
tree | 4ef18893a0f5618484a721a3851eeeb68a222eba /include/asm-ppc/ocp.h | |
parent | 7f4927c1b505eb4e679ab506bf7626af6258e6b6 (diff) |
[PATCH] u32 vs. pm_message_t in ppc and radeon
This fixes pm_message_t vs. u32 confusion in ppc and aty (I *hope* that's
basically radeon code...). I was not able to test most of these, but I'm
not really changing anything, so it should be okay.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ppc/ocp.h')
-rw-r--r-- | include/asm-ppc/ocp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 5ea44cabfaa4..b98db3cdae83 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h | |||
@@ -119,7 +119,7 @@ struct ocp_driver { | |||
119 | const struct ocp_device_id *id_table; /* NULL if wants all devices */ | 119 | const struct ocp_device_id *id_table; /* NULL if wants all devices */ |
120 | int (*probe) (struct ocp_device *dev); /* New device inserted */ | 120 | int (*probe) (struct ocp_device *dev); /* New device inserted */ |
121 | void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */ | 121 | void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */ |
122 | int (*suspend) (struct ocp_device *dev, u32 state); /* Device suspended */ | 122 | int (*suspend) (struct ocp_device *dev, pm_message_t state); /* Device suspended */ |
123 | int (*resume) (struct ocp_device *dev); /* Device woken up */ | 123 | int (*resume) (struct ocp_device *dev); /* Device woken up */ |
124 | struct device_driver driver; | 124 | struct device_driver driver; |
125 | }; | 125 | }; |