aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:34 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:34 -0400
commitb1c42851b006398dda77a068275e8741e33761f1 (patch)
tree4ef18893a0f5618484a721a3851eeeb68a222eba /include/asm-ppc
parent7f4927c1b505eb4e679ab506bf7626af6258e6b6 (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')
-rw-r--r--include/asm-ppc/macio.h2
-rw-r--r--include/asm-ppc/ocp.h2
-rw-r--r--include/asm-ppc/of_device.h2
3 files changed, 3 insertions, 3 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
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};
diff --git a/include/asm-ppc/of_device.h b/include/asm-ppc/of_device.h
index 14441c629010..7229735a7c18 100644
--- a/include/asm-ppc/of_device.h
+++ b/include/asm-ppc/of_device.h
@@ -55,7 +55,7 @@ struct of_platform_driver
55 int (*probe)(struct of_device* dev, const struct of_match *match); 55 int (*probe)(struct of_device* dev, const struct of_match *match);
56 int (*remove)(struct of_device* dev); 56 int (*remove)(struct of_device* dev);
57 57
58 int (*suspend)(struct of_device* dev, u32 state); 58 int (*suspend)(struct of_device* dev, pm_message_t state);
59 int (*resume)(struct of_device* dev); 59 int (*resume)(struct of_device* dev);
60 int (*shutdown)(struct of_device* dev); 60 int (*shutdown)(struct of_device* dev);
61 61