From d3caf043652d34719e42bbfea9ba4011548a2ecf Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 18 Jan 2006 18:40:16 -0500
Subject: [PATCH] --- yaml --- r: 20031 b: refs/heads/master c:
 83ec98be051b277635bc7379b863b25f6dbe54ce h: refs/heads/master i:   20029:
 f536c9259b935cad6ef1fa26010fbf951891a151   20027:
 9e6f12ef26293c1cd933682261e2ca11b89088a0   20023:
 865f0fda66ac01d4ab8c8d910a9c7fc05229ce11   20015:
 f21df959831372857b22aec0a3aba4167159080e   19999:
 b3bcbb81740de4aaa9ba01c1c87212141951cd3a   19967:
 2ae24708c9a70301c6f6e424c2f144f4ee911f14 v: v3

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

diff --git a/[refs] b/[refs]
index e193efa4154b..b70c9a0f77af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6298c22c5e9f698812e2520003ee178aad50c10
+refs/heads/master: 83ec98be051b277635bc7379b863b25f6dbe54ce
diff --git a/trunk/arch/ppc/syslib/ocp.c b/trunk/arch/ppc/syslib/ocp.c
index ab34b1d6072f..2fe28ded2c60 100644
--- a/trunk/arch/ppc/syslib/ocp.c
+++ b/trunk/arch/ppc/syslib/ocp.c
@@ -189,8 +189,8 @@ ocp_device_resume(struct device *dev)
 struct bus_type ocp_bus_type = {
 	.name = "ocp",
 	.match = ocp_device_match,
-	.probe = ocp_driver_probe,
-	.remove = ocp_driver_remove,
+	.probe = ocp_device_probe,
+	.remove = ocp_device_remove,
 	.suspend = ocp_device_suspend,
 	.resume = ocp_device_resume,
 };