diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 17:19:18 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 17:19:18 +0300 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/mmc/host/mvsdio.c | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
| download | linux-2ade0c1d9d93b7642212657ef76f4a1e30233711.tar.xz | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mmc/host/mvsdio.c')
| -rw-r--r-- | drivers/mmc/host/mvsdio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index 366eefa77c5a..a5bf60e01af4 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -742,8 +742,7 @@ static int __init mvsd_probe(struct platform_device *pdev) mmc->max_blk_size = 2048; mmc->max_blk_count = 65535; - mmc->max_hw_segs = 1; - mmc->max_phys_segs = 1; + mmc->max_segs = 1; mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count; mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |