diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-25 14:52:00 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-25 14:52:00 +0000 |
commit | e0837a51f0deb1c30b26076779ca7a19ad8ada79 (patch) | |
tree | 7e17f8c0309a8f8ef6dd164a6ecad804d4b81ff9 /target/linux/brcm47xx/patches-3.3/231-bcma_reorder_sprom_fill.patch | |
parent | ab2cb9ce613c0f9de0d436926ea58ab25cff5074 (diff) | |
download | upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.gz upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.bz2 upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.zip |
brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.
SVN-Revision: 32845
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/231-bcma_reorder_sprom_fill.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.3/231-bcma_reorder_sprom_fill.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/231-bcma_reorder_sprom_fill.patch b/target/linux/brcm47xx/patches-3.3/231-bcma_reorder_sprom_fill.patch deleted file mode 100644 index f4c2e26507..0000000000 --- a/target/linux/brcm47xx/patches-3.3/231-bcma_reorder_sprom_fill.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -137,6 +137,7 @@ static int bcm47xx_get_sprom_ssb(struct - char prefix[10]; - - if (bus->bustype == SSB_BUSTYPE_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)); -@@ -165,6 +166,7 @@ static int bcm47xx_get_invariants(struct - if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0) - iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0); - -+ memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); - bcm47xx_fill_sprom(&iv->sprom, NULL); - - if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) -@@ -263,12 +265,14 @@ static int bcm47xx_get_sprom_bcma(struct - - switch (bus->hosttype) { - case 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: -+ memset(out, 0, sizeof(struct ssb_sprom)); - bcm47xx_fill_sprom_ethernet(out, NULL); - core = bcma_find_core(bus, BCMA_CORE_80211); - if (core) { ---- a/arch/mips/bcm47xx/sprom.c -+++ b/arch/mips/bcm47xx/sprom.c -@@ -555,8 +555,6 @@ void bcm47xx_fill_sprom_ethernet(struct - - void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix) - { -- memset(sprom, 0, sizeof(struct ssb_sprom)); -- - bcm47xx_fill_sprom_ethernet(sprom, prefix); - - nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0); |