diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
| commit | 5d4be21553ddc62ac97b9698c656829d7e814ee1 (patch) | |
| tree | 96d2c11b857e6ec2cd443a6bb5cc76239994c1f9 /target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch | |
| parent | 5abe49b74ed399880c9f16e0fac2e1a2b302f9d7 (diff) | |
| download | upstream-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.gz upstream-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.bz2 upstream-5d4be21553ddc62ac97b9698c656829d7e814ee1.zip | |
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0
targets might need a minor refresh as well, however, it looks
like everything still applies cleanly with occasional small
offsets.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch index ef12cac9bf..e49a841b0b 100644 --- a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-4.0/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[] = { -@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct +@@ -1398,6 +1399,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 **************************************************/ -@@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1517,6 +1529,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"); -@@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1543,6 +1565,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |