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/macio.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/macio.h')
-rw-r--r-- | include/asm-ppc/macio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/macio.h b/include/asm-ppc/macio.h index 00605bb88b2a..2cafc9978607 100644 --- a/include/asm-ppc/macio.h +++ b/include/asm-ppc/macio.h | |||
@@ -126,7 +126,7 @@ struct macio_driver | |||
126 | int (*probe)(struct macio_dev* dev, const struct of_match *match); | 126 | int (*probe)(struct macio_dev* dev, const struct of_match *match); |
127 | int (*remove)(struct macio_dev* dev); | 127 | int (*remove)(struct macio_dev* dev); |
128 | 128 | ||
129 | int (*suspend)(struct macio_dev* dev, u32 state); | 129 | int (*suspend)(struct macio_dev* dev, pm_message_t state); |
130 | int (*resume)(struct macio_dev* dev); | 130 | int (*resume)(struct macio_dev* dev); |
131 | int (*shutdown)(struct macio_dev* dev); | 131 | int (*shutdown)(struct macio_dev* dev); |
132 | 132 | ||