diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /drivers/mmc/omap.c | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
| download | kernel-crypto-06d8bf64ba25db42fcc60d2da2268ac22af94e77.tar.gz kernel-crypto-06d8bf64ba25db42fcc60d2da2268ac22af94e77.tar.xz kernel-crypto-06d8bf64ba25db42fcc60d2da2268ac22af94e77.zip | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'drivers/mmc/omap.c')
| -rw-r--r-- | drivers/mmc/omap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index d30540b2761..1e96a2f6502 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -1099,8 +1099,10 @@ static int __init mmc_omap_probe(struct platform_device *pdev) */ mmc->max_phys_segs = 32; mmc->max_hw_segs = 32; - mmc->max_sectors = 256; /* NBLK max 11-bits, OMAP also limited by DMA */ - mmc->max_seg_size = mmc->max_sectors * 512; + mmc->max_blk_size = 2048; /* BLEN is 11 bits (+1) */ + mmc->max_blk_count = 2048; /* NBLK is 11 bits (+1) */ + mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; + mmc->max_seg_size = mmc->max_req_size; if (host->power_pin >= 0) { if ((ret = omap_request_gpio(host->power_pin)) != 0) { |