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/imxmmc.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/imxmmc.c')
| -rw-r--r-- | drivers/mmc/host/imxmmc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c index 5a950b16d9e6..881f7ba545ae 100644 --- a/drivers/mmc/host/imxmmc.c +++ b/drivers/mmc/host/imxmmc.c | |||
| @@ -966,8 +966,7 @@ static int __init imxmci_probe(struct platform_device *pdev) | |||
| 966 | mmc->caps = MMC_CAP_4_BIT_DATA; | 966 | mmc->caps = MMC_CAP_4_BIT_DATA; |
| 967 | 967 | ||
| 968 | /* MMC core transfer sizes tunable parameters */ | 968 | /* MMC core transfer sizes tunable parameters */ |
| 969 | mmc->max_hw_segs = 64; | 969 | mmc->max_segs = 64; |
| 970 | mmc->max_phys_segs = 64; | ||
| 971 | mmc->max_seg_size = 64*512; /* default PAGE_CACHE_SIZE */ | 970 | mmc->max_seg_size = 64*512; /* default PAGE_CACHE_SIZE */ |
| 972 | mmc->max_req_size = 64*512; /* default PAGE_CACHE_SIZE */ | 971 | mmc->max_req_size = 64*512; /* default PAGE_CACHE_SIZE */ |
| 973 | mmc->max_blk_size = 2048; | 972 | mmc->max_blk_size = 2048; |