diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /drivers/mmc/imxmmc.c | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mmc/imxmmc.c')
| -rw-r--r-- | drivers/mmc/imxmmc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index bfb9ff693208..b060d4bfba29 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c | |||
| @@ -958,8 +958,10 @@ static int imxmci_probe(struct platform_device *pdev) | |||
| 958 | /* MMC core transfer sizes tunable parameters */ | 958 | /* MMC core transfer sizes tunable parameters */ |
| 959 | mmc->max_hw_segs = 64; | 959 | mmc->max_hw_segs = 64; |
| 960 | mmc->max_phys_segs = 64; | 960 | mmc->max_phys_segs = 64; |
| 961 | mmc->max_sectors = 64; /* default 1 << (PAGE_CACHE_SHIFT - 9) */ | ||
| 962 | mmc->max_seg_size = 64*512; /* default PAGE_CACHE_SIZE */ | 961 | mmc->max_seg_size = 64*512; /* default PAGE_CACHE_SIZE */ |
| 962 | mmc->max_req_size = 64*512; /* default PAGE_CACHE_SIZE */ | ||
| 963 | mmc->max_blk_size = 2048; | ||
| 964 | mmc->max_blk_count = 65535; | ||
| 963 | 965 | ||
| 964 | host = mmc_priv(mmc); | 966 | host = mmc_priv(mmc); |
| 965 | host->mmc = mmc; | 967 | host->mmc = mmc; |