From: John Crispin Date: Tue, 24 Jun 2014 18:13:09 +0000 (+0000) Subject: atheros[ar231x-eth]: merge patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f8893629ecf4e8682f1f6faaeaba74f21e494767;p=openwrt%2Fstaging%2Fadrian.git 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 SVN-Revision: 41316 --- diff --git a/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch index 1c9d58b823..5532a5fb53 100644 --- a/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch @@ -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); diff --git a/target/linux/atheros/patches-3.10/230-3_10-updates.patch b/target/linux/atheros/patches-3.10/230-3_10-updates.patch deleted file mode 100644 index ef273b5e17..0000000000 --- a/target/linux/atheros/patches-3.10/230-3_10-updates.patch +++ /dev/null @@ -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);