[OpenWrt-Devel] [PATCH 01/10] atheros[ar231x-eth]: merge patch

[Sergey Ryazanov]

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 at gmail.com>
---
This change helps to avoid annoying 'quilt push -a' with further 'quilt
pop XXX' to do a build test.

 target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch |  2 +-
 target/linux/atheros/patches-3.10/230-3_10-updates.patch    | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 target/linux/atheros/patches-3.10/230-3_10-updates.patch

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 1c9d58b..5532a5f 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 ef273b5..0000000
--- 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);
-- 
1.8.1.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel