diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-14 15:36:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-14 15:36:57 -0800 |
| commit | a2224ad38704a3cfe033313f803183a23e6b7886 (patch) | |
| tree | ec764bccd0065e97e927c26460cf64f11a92e0f4 /drivers/net/phy | |
| parent | 5421ae0153b4ba0469967cfd8de96144e3bf3979 (diff) | |
| parent | 3e44017b589f001941723dfdfede2ca6284dddce (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index d0ed1ef284a8..536bda1f428b 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/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); |