diff options
| author | Peter Denison <openwrt@marshadder.org> | 2007-06-25 19:51:09 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2007-06-25 19:51:09 +0000 |
| commit | eed7b91c68806d8e6c72aabfadf2322b76997e3a (patch) | |
| tree | 15ec468516ccbd0e750abf2a62410f7bdca5be8d /target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c | |
| parent | 7e4f2dbf6674f1691acbeceacabd54ae4e09b5d4 (diff) | |
| download | upstream-eed7b91c68806d8e6c72aabfadf2322b76997e3a.tar.gz upstream-eed7b91c68806d8e6c72aabfadf2322b76997e3a.tar.bz2 upstream-eed7b91c68806d8e6c72aabfadf2322b76997e3a.zip | |
Merge SSB driver from tree at bu3sch.de, pulled 24/6
SVN-Revision: 7732
Diffstat (limited to 'target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c')
| -rw-r--r-- | target/linux/brcm47xx-2.6/files/drivers/ssb/scan.c | 8 |
1 files changed, 8 insertions, 0 deletions
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 feaf1e57d0..b5d909c3a5 100644 --- 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; } |