Merge branch 'topic/asoc' into for-linus

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

diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index c8da5d30a861b5b7a294945f59aae0d80968c128..41e5a60493ad6d64a665f785e8feb1491f3d797f 100644 (file)
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -964,7 +964,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
                goto out1;
        }
 
-       host->ioarea = request_mem_region(r->start, r->end - r->start + 1,
+       host->ioarea = request_mem_region(r->start, resource_size(r),
                                           pdev->name);
        if (!host->ioarea) {
                dev_err(&pdev->dev, "mmio already in use\n");
@@ -998,7 +998,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
        mmc->f_max = 24000000;
 
        mmc->max_seg_size = AU1XMMC_DESCRIPTOR_SIZE;
-       mmc->max_phys_segs = AU1XMMC_DESCRIPTOR_COUNT;
+       mmc->max_segs = AU1XMMC_DESCRIPTOR_COUNT;
 
        mmc->max_blk_size = 2048;
        mmc->max_blk_count = 512;