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/mmc.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/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 74eaaee66de..5b9caa7978d 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -996,7 +996,6 @@ static void mmc_read_scrs(struct mmc_host *host) mmc_set_data_timeout(&data, card, 0); - data.blksz_bits = 3; data.blksz = 1 << 3; data.blocks = 1; data.flags = MMC_DATA_READ; |