diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 17:52:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-04 17:52:27 -0400 |
| commit | 6fc56ccfe44c8bc3fb47d6346c12c3b865756ef8 (patch) | |
| tree | e7e9dabd9d5bcf547946b3ae68e64ea68525e9d0 /include/linux | |
| parent | cbdf811c77cf2906a099b8da92e9f6f335b68a73 (diff) | |
| parent | 920e70c5c603ada05dd480ca0ccc0ae12a5fdc39 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] Move set_ios debugging into mmc.c
[MMC] Correct mmc_request_done comments
[MMC] PXA: reduce the number of lines PXAMCI debug uses
[MMC] PXA and i.MX: don't avoid sending stop command on error
[MMC] extend data timeout for writes
[ARM] 3485/1: i.MX: MX1 SD/MMC fix of unintentional double start possibility
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/card.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 30dd978c1ec8..991a37382a22 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h | |||
| @@ -28,6 +28,7 @@ struct mmc_csd { | |||
| 28 | unsigned short cmdclass; | 28 | unsigned short cmdclass; |
| 29 | unsigned short tacc_clks; | 29 | unsigned short tacc_clks; |
| 30 | unsigned int tacc_ns; | 30 | unsigned int tacc_ns; |
| 31 | unsigned int r2w_factor; | ||
| 31 | unsigned int max_dtr; | 32 | unsigned int max_dtr; |
| 32 | unsigned int read_blkbits; | 33 | unsigned int read_blkbits; |
| 33 | unsigned int write_blkbits; | 34 | unsigned int write_blkbits; |