Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/ucc_geth.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 8a98d407692b..c05c2d69fbf6 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -279,11 +279,11 @@ static int dnet_mii_probe(struct net_device *dev)
 
         /* attach the mac to the phy */
         if (bp->capabilities & DNET_HAS_RMII) {
-                phydev = phy_connect(dev, phydev->dev.bus_id,
+                phydev = phy_connect(dev, dev_name(&phydev->dev),
                                      &dnet_handle_link_change, 0,
                                      PHY_INTERFACE_MODE_RMII);
         } else {
-                phydev = phy_connect(dev, phydev->dev.bus_id,
+                phydev = phy_connect(dev, dev_name(&phydev->dev),
                                      &dnet_handle_link_change, 0,
                                      PHY_INTERFACE_MODE_MII);
         }
@@ -926,7 +926,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
         phydev = bp->phy_dev;
         dev_info(&pdev->dev, "attached PHY driver [%s] "
                "(mii_bus:phy_addr=%s, irq=%d)\n",
-               phydev->drv->name, phydev->dev.bus_id, phydev->irq);
+               phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
 
         return 0;