Merge git://git.infradead.org/~dwmw2/rbtree-2.6

[linux-2.6-omap-h63xx.git] / drivers / mmc / sdhci.c

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index bdbfca050029a91548bd1d4e59a64ab8bb1705a4..6bfcdbc7491e9ac01a601cd364016dcdc05b18cf 100644 (file)
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -570,10 +570,6 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
        spin_lock_irqsave(&host->lock, flags);
 
-       DBG("clock %uHz busmode %u powermode %u cs %u Vdd %u width %u\n",
-            ios->clock, ios->bus_mode, ios->power_mode, ios->chip_select,
-            ios->vdd, ios->bus_width);
-
        /*
         * Reset the chip on each power off.
         * Should clear out any weird states.
@@ -1077,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);