From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 2 Jul 2014 22:03:03 +0000 (+0000)
Subject: brcm47xx: refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f95fc5b2d544f1f49cd2761160d27467521b8d3a;p=openwrt%2Fstaging%2Fblocktrron.git

brcm47xx: refresh patches

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41487
---

diff --git a/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch b/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch
index 9c669e6cb5..038e6a0b77 100644
--- a/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch
+++ b/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch
@@ -18,7 +18,7 @@ Patchwork: http://patchwork.linux-mips.org/patch/6211/
 
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -135,7 +135,7 @@ static void nvram_read_leddc(const char 
+@@ -135,7 +135,7 @@ static void nvram_read_leddc(const char
  }
  
  static void nvram_read_macaddr(const char *prefix, const char *name,
diff --git a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
index eb5391ca13..a1ab0d2b09 100644
--- a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
+++ b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
@@ -156,7 +156,7 @@
  	} else {
  		u32 bmcr;
  
-@@ -12122,7 +12129,7 @@ static int tg3_set_pauseparam(struct net
+@@ -12124,7 +12131,7 @@ static int tg3_set_pauseparam(struct net
  		u32 newadv;
  		struct phy_device *phydev;
  
@@ -165,7 +165,7 @@
  
  		if (!(phydev->supported & SUPPORTED_Pause) ||
  		    (!(phydev->supported & SUPPORTED_Asym_Pause) &&
-@@ -13556,7 +13563,7 @@ static int tg3_ioctl(struct net_device *
+@@ -13558,7 +13565,7 @@ static int tg3_ioctl(struct net_device *
  		struct phy_device *phydev;
  		if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
  			return -EAGAIN;
@@ -174,7 +174,7 @@
  		return phy_mii_ioctl(phydev, ifr, cmd);
  	}
  
-@@ -17192,8 +17199,10 @@ static int tg3_init_one(struct pci_dev *
+@@ -17194,8 +17201,10 @@ static int tg3_init_one(struct pci_dev *
  			tg3_flag_set(tp, FLUSH_POSTED_WRITES);
  		if (ssb_gige_one_dma_at_once(pdev))
  			tg3_flag_set(tp, ONE_DMA_AT_ONCE);
@@ -186,7 +186,7 @@
  		if (ssb_gige_is_rgmii(pdev))
  			tg3_flag_set(tp, RGMII_MODE);
  	}
-@@ -17463,7 +17472,7 @@ static int tg3_init_one(struct pci_dev *
+@@ -17464,7 +17473,7 @@ static int tg3_init_one(struct pci_dev *
  
  	if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
  		struct phy_device *phydev;