summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/ocp.h
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 15:25:34 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:34 -0700
commitb1c42851b006398dda77a068275e8741e33761f1 (patch)
tree4ef18893a0f5618484a721a3851eeeb68a222eba /include/asm-ppc/ocp.h
parent7f4927c1b505eb4e679ab506bf7626af6258e6b6 (diff)
downloadop-kernel-dev-b1c42851b006398dda77a068275e8741e33761f1.zip
op-kernel-dev-b1c42851b006398dda77a068275e8741e33761f1.tar.gz
[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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h
index 5ea44ca..b98db3c 100644
--- a/include/asm-ppc/ocp.h
+++ b/include/asm-ppc/ocp.h
@@ -119,7 +119,7 @@ struct ocp_driver {
const struct ocp_device_id *id_table; /* NULL if wants all devices */
int (*probe) (struct ocp_device *dev); /* New device inserted */
void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */
- int (*suspend) (struct ocp_device *dev, u32 state); /* Device suspended */
+ int (*suspend) (struct ocp_device *dev, pm_message_t state); /* Device suspended */
int (*resume) (struct ocp_device *dev); /* Device woken up */
struct device_driver driver;
};
OpenPOWER on IntegriCloud