aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-13 17:32:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-13 17:32:33 +0000
commit402c9a689ecc7e6d32913ae7161ceb038a27e848 (patch)
tree900605bee0d7fea650f2d96394db47796afaa9f4 /target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
parentaef07fb7c85d795a3f1b36fb831d6b76617f3768 (diff)
downloadupstream-402c9a689ecc7e6d32913ae7161ceb038a27e848.tar.gz
upstream-402c9a689ecc7e6d32913ae7161ceb038a27e848.tar.bz2
upstream-402c9a689ecc7e6d32913ae7161ceb038a27e848.zip
kernel: sync bgmac changes with latest upstream submission
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45420 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch')
-rw-r--r--target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch b/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
index d1b63f155b..b38a116f93 100644
--- a/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
+++ b/target/linux/generic/patches-3.18/077-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1609,8 +1609,11 @@ static int bgmac_probe(struct bcma_devic
+@@ -1604,8 +1604,11 @@ static int bgmac_probe(struct bcma_devic
ns_core = bcma_find_core_unit(core->bus,
BCMA_CORE_MAC_GBIT,
ns_gmac);