kernel: add a ssb backport required for a new mac80211 update

[openwrt/openwrt.git] / target / linux / brcm47xx / patches-3.10 / 095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch

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 a4bc08adcacedc1c1aeb95cabacc67b37b226e8a..9c669e6cb5c81ea9f3b5b5706f4d4a2138d94177 100644 (file)
--- 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,
@@ -50,7 +50,7 @@ Patchwork: http://patchwork.linux-mips.org/patch/6211/
  }
  
  static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
-@@ -180,7 +180,7 @@ static void bcm47xx_fill_sprom_r1234589(
+@@ -181,7 +181,7 @@ static void bcm47xx_fill_sprom_r1234589(
                      fallback);
        nvram_read_s8(prefix, NULL, "ag1", &sprom->antenna_gain.a1, 0,
                      fallback);
@@ -59,7 +59,7 @@ Patchwork: http://patchwork.linux-mips.org/patch/6211/
  }
  
  static void bcm47xx_fill_sprom_r12389(struct ssb_sprom *sprom,
-@@ -633,20 +633,20 @@ static void bcm47xx_fill_sprom_path_r45(
+@@ -634,20 +634,20 @@ static void bcm47xx_fill_sprom_path_r45(
  static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
                                        const char *prefix, bool fallback)
  {