diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-24 12:31:18 +1100 |
| commit | add902e5b0ec4c0f19c8fb255ad800d40e6cc01a (patch) | |
| tree | 952e9138673a59acca5b1808765e58540767e9b0 /drivers/net/au1000_eth.c | |
| parent | 27e1a1abb39177a99d2f55ab70255fcab4132f50 (diff) | |
| parent | 7bcd547ab98aff3ebf955cc59d976bc873fd3822 (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'drivers/net/au1000_eth.c')
| -rw-r--r-- | drivers/net/au1000_eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 9c875bb3f76c..79aec32c6add 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -355,8 +355,8 @@ static int mii_probe (struct net_device *dev) /* now we are supposed to have a proper phydev, to attach to... */ BUG_ON(phydev->attached_dev); - phydev = phy_connect(dev, phydev->dev.bus_id, &au1000_adjust_link, 0, - PHY_INTERFACE_MODE_MII); + phydev = phy_connect(dev, dev_name(&phydev->dev), &au1000_adjust_link, + 0, PHY_INTERFACE_MODE_MII); if (IS_ERR(phydev)) { printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); @@ -381,8 +381,8 @@ static int mii_probe (struct net_device *dev) aup->phy_dev = phydev; printk(KERN_INFO "%s: attached PHY driver [%s] " - "(mii_bus:phy_addr=%s, irq=%d)\n", - dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq); + "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name, + phydev->drv->name, dev_name(&phydev->dev), phydev->irq); return 0; } |