diff --git a/[refs] b/[refs] index 8a5cc5370300..79fd9c196ac5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d022bbc712eb1fc53fbbec27a9f0ae07f55f9b65 +refs/heads/master: e5c7d1f669806289e121b9ac3535e8f6de594b8e diff --git a/trunk/drivers/of/of_mdio.c b/trunk/drivers/of/of_mdio.c index 980c079e4443..483c0adcad87 100644 --- a/trunk/drivers/of/of_mdio.c +++ b/trunk/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;