Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 0012f5d13d28..62e5a4d171e1 100644
--- 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);
@@ -1235,8 +1235,7 @@ static int __devinit wbsd_alloc_mmc(struct device *dev)
          * Maximum number of segments. Worst case is one sector per segment
          * so this will be 64kB/512.
          */
-        mmc->max_hw_segs = 128;
-        mmc->max_phys_segs = 128;
+        mmc->max_segs = 128;
 
         /*
          * Maximum request size. Also limited by 64KiB buffer.