---

yaml --- r: 115 b: refs/heads/master c: f451390 h: refs/heads/master i: 113: 81ff381 111: c926d6d v: v3
git-mirror · Apr 16, 2005 · f58148e · f58148e
1 parent d7456b9
commit f58148e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);
-Original file line number
+Diff line change
@@ Expand Up @@
     }
-    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);
@@ Expand Down @@