diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-14 10:45:12 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-14 10:45:12 +0000 |
| commit | 4893c0c7f734311b70d686362063e5333a86ac17 (patch) | |
| tree | 4b592c70237f6a0e2e44a60845269ef1a46ebdd9 /target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch | |
| parent | 285348e0868ac6d84acb6b3caa45aa9afdb87196 (diff) | |
| download | upstream-4893c0c7f734311b70d686362063e5333a86ac17.tar.gz upstream-4893c0c7f734311b70d686362063e5333a86ac17.tar.bz2 upstream-4893c0c7f734311b70d686362063e5333a86ac17.zip | |
generic: upgrade to 3.18.7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44442
Diffstat (limited to 'target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch b/target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch index 0043b4c84f..1d6b66c199 100644 --- a/target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch +++ b/target/linux/generic/patches-3.18/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch @@ -18,11 +18,9 @@ Can we have it for 3.20, please? drivers/net/ethernet/broadcom/bgmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index 3007d95..728373b 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) +@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ static int bgmac_probe(struct bcma_device *core) { @@ -30,7 +28,7 @@ index 3007d95..728373b 100644 struct net_device *net_dev; struct bgmac *bgmac; struct ssb_sprom *sprom = &core->bus->sprom; -@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) +@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic bgmac_chip_reset(bgmac); /* For Northstar, we have to take all GMAC core out of reset */ @@ -41,6 +39,3 @@ index 3007d95..728373b 100644 struct bcma_device *ns_core; int ns_gmac; --- -1.8.4.5 - |