diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:23:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:23:55 -0400 |
| commit | fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (patch) | |
| tree | f29b18c6e564e515212b6c88e89cf5770cc0f350 /drivers/mmc/at91_mci.c | |
| parent | 94c12cc7d196bab34aaa98d38521549fa1e5ef76 (diff) | |
| parent | 2ed6d22cec37d9a3df4c5bacf1160dee7700106e (diff) | |
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/at91_mci.c')
| -rw-r--r-- | drivers/mmc/at91_mci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c index 6b7638b84290..d34b7d9d92ed 100644 --- a/drivers/mmc/at91_mci.c +++ b/drivers/mmc/at91_mci.c | |||
| @@ -822,6 +822,7 @@ static int at91_mci_probe(struct platform_device *pdev) | |||
| 822 | mmc->f_min = 375000; | 822 | mmc->f_min = 375000; |
| 823 | mmc->f_max = 25000000; | 823 | mmc->f_max = 25000000; |
| 824 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; | 824 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; |
| 825 | mmc->caps = MMC_CAP_BYTEBLOCK; | ||
| 825 | 826 | ||
| 826 | host = mmc_priv(mmc); | 827 | host = mmc_priv(mmc); |
| 827 | host->mmc = mmc; | 828 | host->mmc = mmc; |