Merge branch 'master' into csb1725

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

diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index ff7752348b113cd154582187372e658784f66dc2..1290d14c5839572a27f6354f3ab227ec6ff79c93 100644 (file)
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1164,8 +1164,7 @@ msmsdcc_probe(struct platform_device *pdev)
                mmc->caps |= MMC_CAP_SDIO_IRQ;
        mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
 
-       mmc->max_phys_segs = NR_SG;
-       mmc->max_hw_segs = NR_SG;
+       mmc->max_segs = NR_SG;
        mmc->max_blk_size = 4096;       /* MCI_DATA_CTL BLOCKSIZE up to 4096 */
        mmc->max_blk_count = 65536;