Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / mmc / host / s3cmci.c

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 976330de379ecc78cbe91f19c4bd9495d4722dae..1ccd4b256ceec11008370a1691d00c7018570cbe 100644 (file)
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -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",