linux/3.2: build mdio_register_board_info into the kernel if PHYLIB is selected

[openwrt.git] / target / linux / brcm47xx / patches-3.2 / 231-bcma_reorder_sprom_fill.patch

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 a9f176f..ae7b7d4 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -96,6 +96,7 @@ static int bcm47xx_get_sprom_ssb(struct
+@@ -98,6 +98,7 @@ static int bcm47xx_get_sprom_ssb(struct
        char prefix[10];
  
        if (bus->bustype == SSB_BUSTYPE_PCI) {
@@ -8,7 +8,7 @@
                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
                         bus->host_pci->bus->number + 1,
                         PCI_SLOT(bus->host_pci->devfn));
-@@ -124,6 +125,7 @@ static int bcm47xx_get_invariants(struct
+@@ -126,6 +127,7 @@ static int bcm47xx_get_invariants(struct
        if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
                iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
  
@@ -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
+@@ -205,12 +207,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);