tree 9d6a935441e9414244c17e2bef35c3b6934e9355
parent 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:32 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:32 -0700
[PATCH] fix u32 vs. pm_message_t in drivers/macintosh
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that
turned out not to be the case as Russel King pointed out. Here are fixes for
drivers/macintosh.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
macintosh/macio_asic.c | 2 +-
macintosh/mediabay.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: drivers/macintosh/macio_asic.c
===================================================================
--- fab311f6e4cfa969630e008ce63e45554a96df07/drivers/macintosh/macio_asic.c
(mode:100644 sha1:3a609ecd251bd3798115453d339c3167ca62ca77)
+++ 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/macintosh/macio_asic.c
(mode:100644 sha1:d0bda7e3e6aa4a8a96c4954d4f76e3ded883f340)
@@ -106,7 +106,7 @@
drv->shutdown(macio_dev);
}
-static int macio_device_suspend(struct device *dev, u32 state)
+static int macio_device_suspend(struct device *dev, pm_message_t state)
{
struct macio_dev * macio_dev = to_macio_device(dev);
struct macio_driver * drv = to_macio_driver(dev->driver);
Index: drivers/macintosh/mediabay.c
===================================================================
--- fab311f6e4cfa969630e008ce63e45554a96df07/drivers/macintosh/mediabay.c
(mode:100644 sha1:b8b5a2f1485a49e58a3b5f7baa6b24edd0dd20a3)
+++ 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/macintosh/mediabay.c
(mode:100644 sha1:4be709e13eecf4c4dd2a2f6c706eeda08b975047)
@@ -704,7 +704,7 @@
}
-static int __pmac media_bay_suspend(struct macio_dev *mdev, u32 state)
+static int __pmac media_bay_suspend(struct macio_dev *mdev, pm_message_t state)
{
struct media_bay_info *bay = macio_get_drvdata(mdev);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
