aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-11-03 19:24:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-03 19:24:39 +0000
commit24d73fbd338ac8cedc6ec92f8db1738fff1b483b (patch)
treeeea21c5f6e34ab2a66b865640552288dafbfd9d9 /target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
parent45d26941b425db0e3f40479522566f33969702a4 (diff)
downloadupstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.tar.gz
upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.tar.bz2
upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.zip
kernel: bgmac: update backport patch
This adds some more bgmac patches from mainline kernel. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38637
Diffstat (limited to 'target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
index b3273969ed..e5ec78d59f 100644
--- a/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.12/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[] = {
-@@ -1410,6 +1411,17 @@ static void bgmac_mii_unregister(struct
+@@ -1443,6 +1444,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
**************************************************/
-@@ -1509,6 +1521,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1542,6 +1554,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");
-@@ -1538,6 +1560,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1571,6 +1593,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);