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/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 976330de379e..a04f87d7ee3d 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -874,7 +874,7 @@ static void finalize_request(struct s3cmci_host *host)
         if (!mrq->data)
                 goto request_done;
 
-        /* Calulate the amout of bytes transfer if there was no error */
+        /* Calculate the amout of bytes transfer if there was no error */
         if (mrq->data->error == 0) {
                 mrq->data->bytes_xfered =
                         (mrq->data->blocks * mrq->data->blksz);
@@ -882,7 +882,7 @@ static void finalize_request(struct s3cmci_host *host)
                 mrq->data->bytes_xfered = 0;
         }
 
-        /* If we had an error while transfering data we flush the
+        /* If we had an error while transferring data we flush the
          * DMA channel and the fifo to clear out any garbage. */
         if (mrq->data->error != 0) {
                 if (s3cmci_host_usedma(host))
@@ -980,7 +980,7 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
 
         if ((data->blksz & 3) != 0) {
                 /* We cannot deal with unaligned blocks with more than
-                 * one block being transfered. */
+                 * one block being transferred. */
 
                 if (data->blocks > 1) {
                         pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz);
@@ -1736,8 +1736,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
         mmc->max_req_size       = 4095 * 512;
         mmc->max_seg_size       = mmc->max_req_size;
 
-        mmc->max_phys_segs      = 128;
-        mmc->max_hw_segs        = 128;
+        mmc->max_segs           = 128;
 
         dbg(host, dbg_debug,
             "probe: mode:%s mapped mci_base:%p irq:%u irq_cd:%u dma:%u.\n",