From a8b98d88258a241c78d02e614d015f45d6af3a96 Mon Sep 17 00:00:00 2001
From: Eugene Surovegin <ebs@ebshome.net>
Date: Tue, 6 Sep 2005 15:16:13 -0700
Subject: [PATCH] --- yaml --- r: 7316 b: refs/heads/master c:
 842363ff5fd79ce75c311175ea832901e2b2d40e h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/ppc/syslib/ocp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a87446c98145..0bd42afcce3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4706df3d3c42af802597d82c8b1542c3d52eab23
+refs/heads/master: 842363ff5fd79ce75c311175ea832901e2b2d40e
diff --git a/trunk/arch/ppc/syslib/ocp.c b/trunk/arch/ppc/syslib/ocp.c
index e5fd2ae503ea..9ccce438bd7a 100644
--- a/trunk/arch/ppc/syslib/ocp.c
+++ b/trunk/arch/ppc/syslib/ocp.c
@@ -165,7 +165,7 @@ ocp_device_remove(struct device *dev)
 }
 
 static int
-ocp_device_suspend(struct device *dev, u32 state)
+ocp_device_suspend(struct device *dev, pm_message_t state)
 {
 	struct ocp_device *ocp_dev = to_ocp_dev(dev);
 	struct ocp_driver *ocp_drv = to_ocp_drv(dev->driver);