From: Pierre Ossman <drzeus@drzeus.cx>
Date: Wed, 31 Dec 2008 18:56:05 +0000 (+0100)
Subject: Merge branch 'master' of ../mmc
X-Git-Tag: v2.6.29-rc1~525^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=418f19ea17a99421b22a64e101e14b6a16bed66d;hp=-c

Merge branch 'master' of ../mmc
---

418f19ea17a99421b22a64e101e14b6a16bed66d
diff --combined drivers/mmc/host/sdricoh_cs.c
index 435863370017,d4748a8e0ded..cb41e9c3ac07
--- a/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);