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/wbsd.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/wbsd.c')
| -rw-r--r-- | drivers/mmc/wbsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index c351c6d1a18a..6435a6822ad3 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -1323,7 +1323,7 @@ static int __devinit wbsd_alloc_mmc(struct device *dev) | |||
| 1323 | mmc->f_min = 375000; | 1323 | mmc->f_min = 375000; |
| 1324 | mmc->f_max = 24000000; | 1324 | mmc->f_max = 24000000; |
| 1325 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; | 1325 | mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; |
| 1326 | mmc->caps = MMC_CAP_4_BIT_DATA; | 1326 | mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE | MMC_CAP_BYTEBLOCK; |
| 1327 | 1327 | ||
| 1328 | spin_lock_init(&host->lock); | 1328 | spin_lock_init(&host->lock); |
| 1329 | 1329 | ||