diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-04 18:25:05 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-04 18:25:05 +0000 |
commit | 5a55ace3b841895d93a6dd7f649e37f35bd2d8d3 (patch) | |
tree | 031f591f1409112e1c8523e471fb79983e3e581d /target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch | |
parent | 815ceabd9dbbae62b30edad7b9e2923d6624fdfb (diff) | |
download | upstream-5a55ace3b841895d93a6dd7f649e37f35bd2d8d3.tar.gz upstream-5a55ace3b841895d93a6dd7f649e37f35bd2d8d3.tar.bz2 upstream-5a55ace3b841895d93a6dd7f649e37f35bd2d8d3.zip |
kernel: bgmac: update the driver patches to a version submitted for mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39201
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.patch | 6 |
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); |