--- a/drivers/net/ethernet/atheros/ar231x/ar231x.c
+++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c
-@@ -135,6 +135,7 @@ static int ar231x_mdiobus_write(struct m
+@@ -133,6 +133,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);
#ifndef ERR
#define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
-@@ -166,6 +167,32 @@ static const struct net_device_ops ar231
+@@ -164,6 +165,32 @@ static const struct net_device_ops ar231
#endif
};
static int ar231x_probe(struct platform_device *pdev)
{
struct net_device *dev;
-@@ -273,6 +300,24 @@ static int ar231x_probe(struct platform_
+@@ -271,6 +298,24 @@ static int ar231x_probe(struct platform_
mdiobus_register(sp->mii_bus);
if (ar231x_mdiobus_probe(dev) != 0) {
printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
rx_tasklet_cleanup(dev);
-@@ -326,8 +371,10 @@ static int ar231x_remove(struct platform
+@@ -324,8 +369,10 @@ static int ar231x_remove(struct platform
rx_tasklet_cleanup(dev);
ar231x_init_cleanup(dev);
unregister_netdev(dev);
kfree(dev);
return 0;
}
-@@ -870,7 +917,8 @@ static int ar231x_open(struct net_device
+@@ -868,7 +915,8 @@ static int ar231x_open(struct net_device
sp->eth_regs->mac_control |= MAC_CONTROL_RE;
return 0;
}
-@@ -951,7 +999,8 @@ static int ar231x_close(struct net_devic
+@@ -949,7 +997,8 @@ static int ar231x_close(struct net_devic
#endif
return 0;
}
-@@ -995,6 +1044,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -993,6 +1042,9 @@ static int ar231x_ioctl(struct net_devic
{
struct ar231x_private *sp = netdev_priv(dev);