atheros[ar231x-eth]: merge patch
authorJohn Crispin <john@openwrt.org>
Tue, 24 Jun 2014 18:13:09 +0000 (18:13 +0000)
committerJohn Crispin <john@openwrt.org>
Tue, 24 Jun 2014 18:13:09 +0000 (18:13 +0000)
Merge 3_10-updates.patch into the ar2313_ethernet.patch since it contains
only one ethernet driver fix.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
SVN-Revision: 41316

target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch
target/linux/atheros/patches-3.10/230-3_10-updates.patch [deleted file]

index 1c9d58b..5532a5f 100644 (file)
 +      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 (file)
index ef273b5..0000000
+++ /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);