aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dnet.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-23 16:35:04 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-23 16:35:04 -0400
commit8be7cdccacfbfc707e7370cad9bb168defed636f (patch)
tree8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/net/dnet.c
parentecd4137320b59759bbe57eef89040ee3e5e66039 (diff)
parent61fa9dcf9329cb92c220f7b656410fbe5e72f933 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ucc_geth.c
Diffstat (limited to 'drivers/net/dnet.c')
-rw-r--r--drivers/net/dnet.c6
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)
279 279
280 /* attach the mac to the phy */ 280 /* attach the mac to the phy */
281 if (bp->capabilities & DNET_HAS_RMII) { 281 if (bp->capabilities & DNET_HAS_RMII) {
282 phydev = phy_connect(dev, phydev->dev.bus_id, 282 phydev = phy_connect(dev, dev_name(&phydev->dev),
283 &dnet_handle_link_change, 0, 283 &dnet_handle_link_change, 0,
284 PHY_INTERFACE_MODE_RMII); 284 PHY_INTERFACE_MODE_RMII);
285 } else { 285 } else {
286 phydev = phy_connect(dev, phydev->dev.bus_id, 286 phydev = phy_connect(dev, dev_name(&phydev->dev),
287 &dnet_handle_link_change, 0, 287 &dnet_handle_link_change, 0,
288 PHY_INTERFACE_MODE_MII); 288 PHY_INTERFACE_MODE_MII);
289 } 289 }
@@ -926,7 +926,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
926 phydev = bp->phy_dev; 926 phydev = bp->phy_dev;
927 dev_info(&pdev->dev, "attached PHY driver [%s] " 927 dev_info(&pdev->dev, "attached PHY driver [%s] "
928 "(mii_bus:phy_addr=%s, irq=%d)\n", 928 "(mii_bus:phy_addr=%s, irq=%d)\n",
929 phydev->drv->name, phydev->dev.bus_id, phydev->irq); 929 phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
930 930
931 return 0; 931 return 0;
932 932