Author: blogic Date: 2014-06-24 20:13:09 +0200 (Tue, 24 Jun 2014) New Revision: 41316
Removed: trunk/target/linux/atheros/patches-3.10/230-3_10-updates.patch Modified: trunk/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch Log: atheros[ar231x-eth]: merge patch Merge 3_10-updates.patch into the ar2313_ethernet.patch since it contains only one ethernet driver fix. Signed-off-by: Sergey Ryazanov <[email protected]> Modified: trunk/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch =================================================================== --- trunk/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch 2014-06-24 18:13:05 UTC (rev 41315) +++ trunk/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch 2014-06-24 18:13:09 UTC (rev 41316) @@ -1258,7 +1258,7 @@ + BUG_ON(phydev->attached_dev); + + phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, -+ 0, PHY_INTERFACE_MODE_MII); ++ PHY_INTERFACE_MODE_MII); + + if (IS_ERR(phydev)) { + printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); Deleted: trunk/target/linux/atheros/patches-3.10/230-3_10-updates.patch =================================================================== --- trunk/target/linux/atheros/patches-3.10/230-3_10-updates.patch 2014-06-24 18:13:05 UTC (rev 41315) +++ trunk/target/linux/atheros/patches-3.10/230-3_10-updates.patch 2014-06-24 18:13:09 UTC (rev 41316) @@ -1,11 +0,0 @@ ---- a/drivers/net/ethernet/ar231x/ar231x.c -+++ b/drivers/net/ethernet/ar231x/ar231x.c -@@ -1272,7 +1272,7 @@ static int ar231x_mdiobus_probe(struct n - BUG_ON(phydev->attached_dev); - - phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, -- 0, PHY_INTERFACE_MODE_MII); -+ PHY_INTERFACE_MODE_MII); - - if (IS_ERR(phydev)) { - printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
