Index: linux-2.6.25.1/drivers/net/cpmac.c
===================================================================
--- linux-2.6.25.1.orig/drivers/net/cpmac.c	2008-05-03 16:24:37.000000000 +0200
+++ linux-2.6.25.1/drivers/net/cpmac.c	2008-05-03 16:24:49.000000000 +0200
@@ -1178,9 +1178,7 @@
 	priv->msg_enable = netif_msg_init(debug_level, 0xff);
 	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
 
-	snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
-
-	priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
+	priv->phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]->dev.bus_id, &cpmac_adjust_link, 0,
 				PHY_INTERFACE_MODE_MII);
 	if (IS_ERR(priv->phy)) {
 		if (netif_msg_drv(priv))