1 Index: linux-2.6.25.4/drivers/net/cpmac.c
2 ===================================================================
3 --- linux-2.6.25.4.orig/drivers/net/cpmac.c
4 +++ linux-2.6.25.4/drivers/net/cpmac.c
5 @@ -1178,9 +1178,7 @@ static int __devinit cpmac_probe(struct
6 priv->msg_enable = netif_msg_init(debug_level, 0xff);
7 memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
9 - snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
11 - priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
12 + priv->phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]->dev.bus_id, &cpmac_adjust_link, 0,
13 PHY_INTERFACE_MODE_MII);
14 if (IS_ERR(priv->phy)) {
15 if (netif_msg_drv(priv))