Merge branch 'master' of ../mmc

diff --combined drivers/mmc/host/sdricoh_cs.c
index 4358633,d4748a8..cb41e9c
--- 1/drivers/mmc/host/sdricoh_cs.c
--- 2/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@@ -82,8 -82,6 +82,8 @@@ static struct pcmcia_device_id pcmcia_i
        /* vendor and device strings followed by their crc32 hashes */
        PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay1Controller", 0xd9f522ed,
                                0xc3901202),
 +      PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay Controller", 0xd9f522ed,
 +                              0xace80909),
        PCMCIA_DEVICE_NULL,
  };
  
@@@ -465,7 -463,7 +465,7 @@@ static int sdricoh_init_mmc(struct pci_
  
  err:
        if (iobase)
-               iounmap(iobase);
+               pci_iounmap(pci_dev, iobase);
        if (mmc)
                mmc_free_host(mmc);