From fb56eb074173f5c29c76019958fc3db3160927f0 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sun, 9 Nov 2008 05:34:47 +0100
Subject: [PATCH] --- yaml --- r: 119083 b: refs/heads/master c:
 3e44017b589f001941723dfdfede2ca6284dddce h: refs/heads/master i:   119081:
 35ae19494e39975e00164c8cd5f3af6c68689381   119079:
 dff85d146373fb7d16f6b29b20bd91911ac0148c v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/phy/mdio_bus.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5fb437f195c..4907c09f9562 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b259e365998291a02488225e32b9f2b73723b3e
+refs/heads/master: 3e44017b589f001941723dfdfede2ca6284dddce
diff --git a/trunk/drivers/net/phy/mdio_bus.c b/trunk/drivers/net/phy/mdio_bus.c
index d0ed1ef284a8..536bda1f428b 100644
--- a/trunk/drivers/net/phy/mdio_bus.c
+++ b/trunk/drivers/net/phy/mdio_bus.c
@@ -136,7 +136,7 @@ void mdiobus_unregister(struct mii_bus *bus)
 	BUG_ON(bus->state != MDIOBUS_REGISTERED);
 	bus->state = MDIOBUS_UNREGISTERED;
 
-	device_unregister(&bus->dev);
+	device_del(&bus->dev);
 	for (i = 0; i < PHY_MAX_ADDR; i++) {
 		if (bus->phy_map[i])
 			device_unregister(&bus->phy_map[i]->dev);