diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/mmc/host/mvsdio.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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) | |||
| 742 | mmc->max_blk_size = 2048; | 742 | mmc->max_blk_size = 2048; |
| 743 | mmc->max_blk_count = 65535; | 743 | mmc->max_blk_count = 65535; |
| 744 | 744 | ||
| 745 | mmc->max_hw_segs = 1; | 745 | mmc->max_segs = 1; |
| 746 | mmc->max_phys_segs = 1; | ||
| 747 | mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count; | 746 | mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count; |
| 748 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | 747 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |
| 749 | 748 | ||