aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-01-04 18:25:05 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-01-04 18:25:05 +0000
commit70bc9601ba67b6f1f400f796e45b83d46f1a0709 (patch)
treebd96f2cfeacf850b1fed4b48bc19d2cdb8f08a64 /target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
parent0a03f4646f3eec5eef4f81adb7f9ba3b7951f45f (diff)
downloadmaster-187ad058-70bc9601ba67b6f1f400f796e45b83d46f1a0709.tar.gz
master-187ad058-70bc9601ba67b6f1f400f796e45b83d46f1a0709.tar.bz2
master-187ad058-70bc9601ba67b6f1f400f796e45b83d46f1a0709.zip
kernel: bgmac: update the driver patches to a version submitted for mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39201 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
index a60ba3ce66..8422309cee 100644
--- a/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1375,6 +1376,17 @@ static void bgmac_mii_unregister(struct
+@@ -1381,6 +1382,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1490,6 +1502,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1507,6 +1519,16 @@ static int bgmac_probe(struct bcma_devic
goto err_dma_free;
}
@@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
err = register_netdev(bgmac->net_dev);
if (err) {
bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1519,6 +1541,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1536,6 +1558,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);