diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-08-24 16:31:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-24 16:31:47 +0200 |
commit | 166656b1bde4dd4272a631512f226276c3a81d26 (patch) | |
tree | 6275373cf98ad4f7c44817325bb48bd6e7fd0ef1 /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | |
parent | 7885f022b978ee84eda5559a98dc683bbf0c8f00 (diff) | |
parent | 83767cf94f909f5932540da7641a12b7dfa71d85 (diff) | |
download | master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.tar.gz master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.tar.bz2 master-187ad058-166656b1bde4dd4272a631512f226276c3a81d26.zip |
Merge pull request #69 from wigyori/master
Bump legacy 3.18 and 4.1 kernels to latest
Diffstat (limited to 'target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch index b883d73af3..52fc252447 100644 --- a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch @@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * BCMA bus ops **************************************************/ -@@ -1664,6 +1676,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1666,6 +1678,16 @@ static int bgmac_probe(struct bcma_devic net_dev->hw_features = net_dev->features; net_dev->vlan_features = net_dev->features; @@ -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"); -@@ -1690,6 +1712,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1692,6 +1714,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |