Merge branch 'master' into tk71

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

diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 4b0e677d7295091dbd4772054a8c06e20a4d3184..0371bf502249baf416d78b85c88ca1ba218f28b0 100644 (file)
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -462,14 +462,14 @@ static int __devinit sdh_probe(struct platform_device *pdev)
                goto out;
        }
 
-       mmc = mmc_alloc_host(sizeof(*mmc), &pdev->dev);
+       mmc = mmc_alloc_host(sizeof(struct sdh_host), &pdev->dev);
        if (!mmc) {
                ret = -ENOMEM;
                goto out;
        }
 
        mmc->ops = &sdh_ops;
-       mmc->max_phys_segs = 32;
+       mmc->max_segs = 32;
        mmc->max_seg_size = 1 << 16;
        mmc->max_blk_size = 1 << 11;
        mmc->max_blk_count = 1 << 11;