diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 12:04:25 +0000 |
| commit | 9a495f6bbbcb294b9926f4ec32e5bbb339395d00 (patch) | |
| tree | c76b5e53fffd1d6238ba09da9d8bb7a6bde9e474 /target/linux/ar7/patches-3.14/950-cpmac_titan.patch | |
| parent | 3951f9492f31b59602a9a7c46fbb041be0929be0 (diff) | |
| download | upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.gz upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.tar.bz2 upstream-9a495f6bbbcb294b9926f4ec32e5bbb339395d00.zip | |
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43564
Diffstat (limited to 'target/linux/ar7/patches-3.14/950-cpmac_titan.patch')
| -rw-r--r-- | target/linux/ar7/patches-3.14/950-cpmac_titan.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar7/patches-3.14/950-cpmac_titan.patch b/target/linux/ar7/patches-3.14/950-cpmac_titan.patch index bc31222cb8..1d76e9fd78 100644 --- a/target/linux/ar7/patches-3.14/950-cpmac_titan.patch +++ b/target/linux/ar7/patches-3.14/950-cpmac_titan.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c -@@ -1155,6 +1155,8 @@ static int cpmac_probe(struct platform_d +@@ -1154,6 +1154,8 @@ static int cpmac_probe(struct platform_d goto fail; } @@ -9,7 +9,7 @@ dev->irq = platform_get_irq_byname(pdev, "irq"); dev->netdev_ops = &cpmac_netdev_ops; -@@ -1233,7 +1235,7 @@ int cpmac_init(void) +@@ -1232,7 +1234,7 @@ int cpmac_init(void) cpmac_mii->reset = cpmac_mdio_reset; cpmac_mii->irq = mii_irqs; @@ -18,7 +18,7 @@ if (!cpmac_mii->priv) { printk(KERN_ERR "Can't ioremap mdio registers\n"); -@@ -1244,10 +1246,16 @@ int cpmac_init(void) +@@ -1243,10 +1245,16 @@ int cpmac_init(void) #warning FIXME: unhardcode gpio&reset bits ar7_gpio_disable(26); ar7_gpio_disable(27); @@ -37,7 +37,7 @@ cpmac_mii->reset(cpmac_mii); for (i = 0; i < 300; i++) { -@@ -1264,7 +1272,11 @@ int cpmac_init(void) +@@ -1263,7 +1271,11 @@ int cpmac_init(void) mask = 0; } |