diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 14:23:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 14:23:55 -0700 |
| commit | fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (patch) | |
| tree | f29b18c6e564e515212b6c88e89cf5770cc0f350 /drivers/mmc/imxmmc.c | |
| parent | 94c12cc7d196bab34aaa98d38521549fa1e5ef76 (diff) | |
| parent | 2ed6d22cec37d9a3df4c5bacf1160dee7700106e (diff) | |
| download | op-kernel-dev-fecf3404f4aba6d0edeba31eeb018cbb6326dff2.zip op-kernel-dev-fecf3404f4aba6d0edeba31eeb018cbb6326dff2.tar.gz | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] Don't check READY_FOR_DATA when reading
[MMC] MMC_CAP_BYTEBLOCK flag for non-log2 block sizes capable hosts
[MMC] Add multi block-write capability
[MMC] Remove data->blksz_bits member
[MMC] Convert mmci to use data->blksz rather than data->blksz_bits
Diffstat (limited to 'drivers/mmc/imxmmc.c')
| -rw-r--r-- | drivers/mmc/imxmmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index fb6565b..1b79dd2 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c @@ -956,7 +956,7 @@ static int imxmci_probe(struct platform_device *pdev) mmc->f_min = 150000; mmc->f_max = CLK_RATE/2; mmc->ocr_avail = MMC_VDD_32_33; - mmc->caps |= MMC_CAP_4_BIT_DATA; + mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_BYTEBLOCK; /* MMC core transfer sizes tunable parameters */ mmc->max_hw_segs = 64; |
