nfsd: fix Documentation typo

[safe/jmp/linux-2.6] / drivers / ssb / scan.c

diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 63ee5cf..b74212d 100644 (file)
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -175,6 +175,9 @@ static u32 scan_read32(struct ssb_bus *bus, u8 current_coreidx,
                } else
                        ssb_pcmcia_switch_segment(bus, 0);
                break;
+       case SSB_BUSTYPE_SDIO:
+               offset += current_coreidx * SSB_CORE_SIZE;
+               return ssb_sdio_scan_read32(bus, offset);
        }
        return readl(bus->mmio + offset);
 }
@@ -188,6 +191,8 @@ static int scan_switchcore(struct ssb_bus *bus, u8 coreidx)
                return ssb_pci_switch_coreidx(bus, coreidx);
        case SSB_BUSTYPE_PCMCIA:
                return ssb_pcmcia_switch_coreidx(bus, coreidx);
+       case SSB_BUSTYPE_SDIO:
+               return ssb_sdio_scan_switch_coreidx(bus, coreidx);
        }
        return 0;
 }
@@ -206,6 +211,8 @@ void ssb_iounmap(struct ssb_bus *bus)
                SSB_BUG_ON(1); /* Can't reach this code. */
 #endif
                break;
+       case SSB_BUSTYPE_SDIO:
+               break;
        }
        bus->mmio = NULL;
        bus->mapped_device = NULL;
@@ -230,6 +237,10 @@ static void __iomem *ssb_ioremap(struct ssb_bus *bus,
                SSB_BUG_ON(1); /* Can't reach this code. */
 #endif
                break;
+       case SSB_BUSTYPE_SDIO:
+               /* Nothing to ioremap in the SDIO case, just fake it */
+               mmio = (void __iomem *)baseaddr;
+               break;
        }
 
        return mmio;