From f58148ef20d08d9a8924086e20ac256a5e3f9635 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:32 -0700 Subject: [PATCH] --- yaml --- r: 115 b: refs/heads/master c: f45139044db870835b53a0fea41da2e04c3958d0 h: refs/heads/master i: 113: 81ff381866f76b30f4b9a529fdfd69743a2e139a 111: c926d6d99e34992574ed370ec7b96d73daf4db64 v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/macio_asic.c | 2 +- trunk/drivers/macintosh/mediabay.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 186a53e1590a..3eab8bad320e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb +refs/heads/master: f45139044db870835b53a0fea41da2e04c3958d0 diff --git a/trunk/drivers/macintosh/macio_asic.c b/trunk/drivers/macintosh/macio_asic.c index 3a609ecd251b..d0bda7e3e6aa 100644 --- a/trunk/drivers/macintosh/macio_asic.c +++ b/trunk/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/trunk/drivers/macintosh/mediabay.c b/trunk/drivers/macintosh/mediabay.c index b8b5a2f1485a..4be709e13eec 100644 --- a/trunk/drivers/macintosh/mediabay.c +++ b/trunk/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);