diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-08-22 17:08:47 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-08-22 17:08:47 +0000 |
commit | 1e5f5ff8231c69e91a02782b2480a11aee42ddd6 (patch) | |
tree | 3a1a71d105d17c19a8e17f4d1c08fee7d905cac2 /target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch | |
parent | 69120f3f477a3046e901d9f19cbfd1aa17c30575 (diff) | |
download | upstream-1e5f5ff8231c69e91a02782b2480a11aee42ddd6.tar.gz upstream-1e5f5ff8231c69e91a02782b2480a11aee42ddd6.tar.bz2 upstream-1e5f5ff8231c69e91a02782b2480a11aee42ddd6.zip |
refresh patches
SVN-Revision: 22769
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch')
-rw-r--r-- | target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch index 884d46d481..84bba9b1c3 100644 --- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch +++ b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch @@ -45,7 +45,7 @@ --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct +@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct goto fail; } @@ -54,7 +54,7 @@ dev->irq = platform_get_irq_byname(pdev, "irq"); dev->netdev_ops = &cpmac_netdev_ops; -@@ -1228,7 +1230,7 @@ int __devinit cpmac_init(void) +@@ -1229,7 +1231,7 @@ int __devinit cpmac_init(void) cpmac_mii->reset = cpmac_mdio_reset; cpmac_mii->irq = mii_irqs; @@ -63,7 +63,7 @@ if (!cpmac_mii->priv) { printk(KERN_ERR "Can't ioremap mdio registers\n"); -@@ -1239,10 +1241,17 @@ int __devinit cpmac_init(void) +@@ -1240,10 +1242,17 @@ int __devinit cpmac_init(void) #warning FIXME: unhardcode gpio&reset bits ar7_gpio_disable(26); ar7_gpio_disable(27); @@ -83,7 +83,7 @@ cpmac_mii->reset(cpmac_mii); for (i = 0; i < 300; i++) -@@ -1257,7 +1266,8 @@ int __devinit cpmac_init(void) +@@ -1258,7 +1267,8 @@ int __devinit cpmac_init(void) mask = 0; } |