From 5605e8bb838cfca9768fe72a56062425198f76b1 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@arm.linux.org.uk>
Date: Thu, 5 Jan 2006 14:43:43 +0000
Subject: [PATCH] --- yaml --- r: 18396 b: refs/heads/master c:
 b6a01e9bda69aaf22f3a23bafc91c0fb51420a7a h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/zorro/zorro-driver.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 43c84bb4246e..a457627ddd82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac33bc3d54936d364c1f979e50f43dfa3f9a13c1
+refs/heads/master: b6a01e9bda69aaf22f3a23bafc91c0fb51420a7a
diff --git a/trunk/drivers/zorro/zorro-driver.c b/trunk/drivers/zorro/zorro-driver.c
index ccba227676f2..fcbee748c592 100644
--- a/trunk/drivers/zorro/zorro-driver.c
+++ b/trunk/drivers/zorro/zorro-driver.c
@@ -77,7 +77,6 @@ int zorro_register_driver(struct zorro_driver *drv)
 	/* initialize common driver fields */
 	drv->driver.name = drv->name;
 	drv->driver.bus = &zorro_bus_type;
-	drv->driver.probe = zorro_device_probe;
 
 	/* register with core */
 	count = driver_register(&drv->driver);
@@ -132,7 +131,8 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv)
 
 struct bus_type zorro_bus_type = {
 	.name	= "zorro",
-	.match	= zorro_bus_match
+	.match	= zorro_bus_match,
+	.probe	= zorro_device_probe,
 };