diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-27 00:12:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-27 00:12:58 -0500 |
| commit | db1d7bf70f42124f73675fca62fe32f3ab1111b4 (patch) | |
| tree | fc6d52f9c898585ddaea22e2775267d3eb389617 /drivers/net/cpmac.c | |
| parent | 3617aa485c7394e20fdaf356b1b78516fcaaa0d1 (diff) | |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cpmac.c')
| -rw-r--r-- | drivers/net/cpmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 4dad04e91f6d..3f476c7c0736 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
| @@ -1161,7 +1161,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) | |||
| 1161 | priv->msg_enable = netif_msg_init(debug_level, 0xff); | 1161 | priv->msg_enable = netif_msg_init(debug_level, 0xff); |
| 1162 | memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); | 1162 | memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); |
| 1163 | 1163 | ||
| 1164 | priv->phy = phy_connect(dev, cpmac_mii->phy_map[phy_id]->dev.bus_id, | 1164 | priv->phy = phy_connect(dev, dev_name(&cpmac_mii->phy_map[phy_id]->dev), |
| 1165 | &cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII); | 1165 | &cpmac_adjust_link, 0, PHY_INTERFACE_MODE_MII); |
| 1166 | if (IS_ERR(priv->phy)) { | 1166 | if (IS_ERR(priv->phy)) { |
| 1167 | if (netif_msg_drv(priv)) | 1167 | if (netif_msg_drv(priv)) |