Merge SSB driver from tree at bu3sch.de, pulled 24/6

[openwrt.git] / target / linux / brcm47xx-2.6 / files / drivers / ssb / scan.c

diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c b/target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c
index feaf1e5..b5d909c 100644 (file)
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c
+++ b/target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c
@@ -202,7 +202,11 @@ void ssb_iounmap(struct ssb_bus *bus)
                iounmap(bus->mmio);
                break;
        case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                pci_iounmap(bus->host_pci, bus->mmio);
+#else
+               assert(0); /* Can't reach this code. */
+#endif
                break;
        }
        bus->mmio = NULL;
@@ -222,7 +226,11 @@ static void __iomem * ssb_ioremap(struct ssb_bus *bus,
                mmio = ioremap(baseaddr, SSB_CORE_SIZE);
                break;
        case SSB_BUSTYPE_PCI:
+#ifdef CONFIG_SSB_PCIHOST
                mmio = pci_iomap(bus->host_pci, 0, ~0UL);
+#else
+               assert(0); /* Can't reach this code. */
+#endif
                break;
        }