summaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-10 09:05:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-10 09:05:58 +0000
commit66c64834f84c8b498cf55e1d1fc2b0fb14fefdab (patch)
tree50131d0934e256d4880d8890183ae7a7a0860ea0 /target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
parent90ca9a582dcbdc6dd4f8f7f6ab015c0fe99ce1e8 (diff)
downloadopenwrt-66c64834f84c8b498cf55e1d1fc2b0fb14fefdab.tar.gz
openwrt-66c64834f84c8b498cf55e1d1fc2b0fb14fefdab.tar.bz2
openwrt-66c64834f84c8b498cf55e1d1fc2b0fb14fefdab.zip
atheros: fix includes
Remove some unnecessary includes and use <linux/foo.h> instead of <asm/foo.h> when it possible as suggested by checkpatch. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 41089
Diffstat (limited to 'target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch')
-rw-r--r--target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
index d7a4d4ad61..5e7a66094b 100644
--- a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
+++ b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/ar231x/ar231x.c
+++ b/drivers/net/ethernet/ar231x/ar231x.c
-@@ -150,6 +150,7 @@ static int ar231x_mdiobus_write(struct m
+@@ -146,6 +146,7 @@ static int ar231x_mdiobus_write(struct m
static int ar231x_mdiobus_reset(struct mii_bus *bus);
static int ar231x_mdiobus_probe (struct net_device *dev);
static void ar231x_adjust_link(struct net_device *dev);
@@ -8,7 +8,7 @@
#ifndef ERR
#define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
-@@ -182,6 +183,32 @@ static const struct net_device_ops ar231
+@@ -178,6 +179,32 @@ static const struct net_device_ops ar231
#endif
};
@@ -41,7 +41,7 @@
int ar231x_probe(struct platform_device *pdev)
{
struct net_device *dev;
-@@ -297,6 +324,23 @@ int ar231x_probe(struct platform_device
+@@ -293,6 +320,23 @@ int ar231x_probe(struct platform_device
mdiobus_register(sp->mii_bus);
@@ -65,7 +65,7 @@
if (ar231x_mdiobus_probe(dev) != 0) {
printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
rx_tasklet_cleanup(dev);
-@@ -353,8 +397,10 @@ static int ar231x_remove(struct platform
+@@ -349,8 +393,10 @@ static int ar231x_remove(struct platform
rx_tasklet_cleanup(dev);
ar231x_init_cleanup(dev);
unregister_netdev(dev);
@@ -78,7 +78,7 @@
kfree(dev);
return 0;
}
-@@ -1115,6 +1161,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -1111,6 +1157,9 @@ static int ar231x_ioctl(struct net_devic
struct ar231x_private *sp = netdev_priv(dev);
int ret;