diff options
| author | Pavel Machek | 2005-04-17 00:25:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-04-17 00:25:34 +0200 |
| commit | b1c42851b006398dda77a068275e8741e33761f1 (patch) | |
| tree | 4ef18893a0f5618484a721a3851eeeb68a222eba /include/asm-ppc/macio.h | |
| parent | [PATCH] fix u32 vs. pm_message_t in PCI, PCIE (diff) | |
| download | kernel-qcow2-linux-b1c42851b006398dda77a068275e8741e33761f1.tar.gz kernel-qcow2-linux-b1c42851b006398dda77a068275e8741e33761f1.tar.xz kernel-qcow2-linux-b1c42851b006398dda77a068275e8741e33761f1.zip | |
[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 int (*probe)(struct macio_dev* dev, const struct of_match *match); int (*remove)(struct macio_dev* dev); - int (*suspend)(struct macio_dev* dev, u32 state); + int (*suspend)(struct macio_dev* dev, pm_message_t state); int (*resume)(struct macio_dev* dev); int (*shutdown)(struct macio_dev* dev); |