aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-03-23 13:28:52 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-03-23 13:28:52 +0000
commitf63e9c8fc9de91f581bface237269523d0a31604 (patch)
treec1899d59eed8ef96621eb0ee0b9daa34a2643245 /target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch
parenta7d8a74af5796b150ae4d53cd2808b35dce1099d (diff)
downloadmaster-187ad058-f63e9c8fc9de91f581bface237269523d0a31604.tar.gz
master-187ad058-f63e9c8fc9de91f581bface237269523d0a31604.tar.bz2
master-187ad058-f63e9c8fc9de91f581bface237269523d0a31604.zip
generic/3.18: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44951 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch')
-rw-r--r--target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch b/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch
index ee49e1cc00..121d2f4122 100644
--- a/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch
+++ b/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch
@@ -17,11 +17,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
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 ea63cb0..676ffe0 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)
{
@@ -29,7 +27,7 @@ index ea63cb0..676ffe0 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 */
@@ -40,6 +38,3 @@ index ea63cb0..676ffe0 100644
struct bcma_device *ns_core;
int ns_gmac;
---
-1.8.4.5
-