Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / mmc / host / wbsd.c

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 7fca0a3..62e5a4d 100644 (file)
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -484,7 +484,7 @@ static void wbsd_fill_fifo(struct wbsd_host *host)
 
        /*
         * Check that we aren't being called after the
-        * entire buffer has been transfered.
+        * entire buffer has been transferred.
         */
        if (host->num_sg == 0)
                return;
@@ -828,7 +828,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq)
        /*
         * If this is a data transfer the request
         * will be finished after the data has
-        * transfered.
+        * transferred.
         */
        if (cmd->data && !cmd->error) {
                /*
@@ -904,7 +904,7 @@ static void wbsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                        setup &= ~WBSD_DAT3_H;
 
                        /*
-                        * We cannot resume card detection immediatly
+                        * We cannot resume card detection immediately
                         * because of capacitance and delays in the chip.
                         */
                        mod_timer(&host->ignore_timer, jiffies + HZ / 100);