diff options
| author | John Crispin <blogic@openwrt.org> | 2014-06-24 18:13:09 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-06-24 18:13:09 +0000 |
| commit | b341c65b7b87244681513bee6163d01caf660612 (patch) | |
| tree | df4beac920e29e9fe24df02357a2ff12d1803677 /target/linux/atheros | |
| parent | fca69de3067fe1907e88dee8f60b453777eec0b7 (diff) | |
| download | upstream-b341c65b7b87244681513bee6163d01caf660612.tar.gz upstream-b341c65b7b87244681513bee6163d01caf660612.tar.bz2 upstream-b341c65b7b87244681513bee6163d01caf660612.zip | |
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 <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41316 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros')
| -rw-r--r-- | target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch | 2 | ||||
| -rw-r--r-- | target/linux/atheros/patches-3.10/230-3_10-updates.patch | 11 |
2 files changed, 1 insertions, 12 deletions
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); |