tree 34fadcf675b19a447ea116c5e5f6a46872cc83c9
parent 5e077cf78426078001a7627e214f95148f6e1f50
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:26:00 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:00 2005
[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]>
macio_asic.c | 2 +-
mediabay.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: drivers/macintosh/macio_asic.c
===================================================================
--- 383f0e5e5f44deedc80a15586dd5cf25bb4db494/drivers/macintosh/macio_asic.c
(mode:100644 sha1:d7aca0d4d3e0ca8de95eeb649305a8bf553c5f8a)
+++ 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/macintosh/macio_asic.c
(mode:100644 sha1:f011cce9e356eefd2f9a36e93ac5d36c86b4671f)
@@ -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
===================================================================
--- 383f0e5e5f44deedc80a15586dd5cf25bb4db494/drivers/macintosh/mediabay.c
(mode:100644 sha1:13f94a8298c7026d557a09e3e5d2ee0ce850dd45)
+++ 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/macintosh/mediabay.c
(mode:100644 sha1:a1133adbfddb31a352b2678805af82a3d2763bce)
@@ -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
