diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:32 -0700 |
| commit | f45139044db870835b53a0fea41da2e04c3958d0 (patch) | |
| tree | 9d6a935441e9414244c17e2bef35c3b6934e9355 | |
| parent | 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb (diff) | |
| download | linux-f45139044db870835b53a0fea41da2e04c3958d0.tar.gz linux-f45139044db870835b53a0fea41da2e04c3958d0.tar.bz2 linux-f45139044db870835b53a0fea41da2e04c3958d0.zip | |
[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 <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/mediabay.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 3a609ecd251b..d0bda7e3e6aa 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c @@ -106,7 +106,7 @@ static void macio_device_shutdown(struct device *dev) 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); diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c index b8b5a2f1485a..4be709e13eec 100644 --- a/drivers/macintosh/mediabay.c +++ b/drivers/macintosh/mediabay.c @@ -704,7 +704,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_ma } -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); |