2 files changed, 2 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1421f74b6009..854a152e5e95 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1895,7 +1895,7 @@ L:	linux-kernel@vger.kernel.org
 W:      http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
 S:      Maintained
 
-MULTIMEDIA CARD SUBSYSTEM
+MULTIMEDIA CARD (MMC) SUBSYSTEM
 P:      Russell King
 M:      rmk+mmc@arm.linux.org.uk
 S:      Maintained
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index b0053280ff2d..6bfcdbc7491e 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1073,7 +1073,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
         tasklet_init(&host->finish_tasklet,
                 sdhci_tasklet_finish, (unsigned long)host);
 
-        setup_timer(&host->timer, sdhci_timeout_timer, (int)host);
+        setup_timer(&host->timer, sdhci_timeout_timer, (long)host);
 
         ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ,
                 host->slot_descr, host);