From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 11 Mar 2012 13:36:46 +0000 (+0000)
Subject: brcm47xx: make patch apply
X-Git-Tag: attitude_adjustment_12.09~2102
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=067a065305aec6b8344095fe986eb2f7e900e63a;p=openwrt%2Fsvn-archive%2Fopenwrt.git

brcm47xx: make patch apply

SVN-Revision: 30876
---

diff --git a/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch b/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch
index a9f176f9a0..c991ed313f 100644
--- a/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch
+++ b/target/linux/brcm47xx/patches-3.2/231-bcma_reorder_sprom_fill.patch
@@ -16,17 +16,17 @@
  	bcm47xx_fill_sprom(&iv->sprom, NULL);
  
  	if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
-@@ -204,12 +206,14 @@ static int bcm47xx_get_sprom_bcma(struct
+@@ -203,12 +205,14 @@ static int bcm47xx_get_sprom_bcma(struct
+ 	struct bcma_device *core;
  
- 	switch (bus->hosttype) {
- 	case BCMA_HOSTTYPE_PCI:
+ 	if (bus->hosttype == BCMA_HOSTTYPE_PCI) {
 +		memset(out, 0, sizeof(struct ssb_sprom));
  		snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
  			 bus->host_pci->bus->number + 1,
  			 PCI_SLOT(bus->host_pci->devfn));
  		bcm47xx_fill_sprom(out, prefix);
  		return 0;
- 	case BCMA_HOSTTYPE_SOC:
+ 	} else if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
 +		memset(out, 0, sizeof(struct ssb_sprom));
  		bcm47xx_fill_sprom_ethernet(out, NULL);
  		core = bcma_find_core(bus, BCMA_CORE_80211);