Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / of / of_mdio.c

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 980c079e444393cc17577e29204b5e28da299938..483c0adcad87d4701b866d6934137e34a5c38ed9 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -182,7 +182,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
        if (!phy_id || sz < sizeof(*phy_id))
                return NULL;
 
-       sprintf(bus_id, PHY_ID_FMT, "0", be32_to_cpu(phy_id[0]));
+       sprintf(bus_id, PHY_ID_FMT, "fixed-0", be32_to_cpu(phy_id[0]));
 
        phy = phy_connect(dev, bus_id, hndlr, 0, iface);
        return IS_ERR(phy) ? NULL : phy;