diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:43:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:43:40 -0500 |
| commit | f9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6 (patch) | |
| tree | 717e9fc0044e9d94dd363670cacc2dff9d5b4407 /include/linux | |
| parent | d354d9afe923eb08f7ee89128b38ddb6415de01d (diff) | |
| parent | f3e2628bed0d5a88ced8239b35f1534557f9631c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/card.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 18fc77f682de..30dd978c1ec8 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h | |||
| @@ -30,7 +30,12 @@ struct mmc_csd { | |||
| 30 | unsigned int tacc_ns; | 30 | unsigned int tacc_ns; |
| 31 | unsigned int max_dtr; | 31 | unsigned int max_dtr; |
| 32 | unsigned int read_blkbits; | 32 | unsigned int read_blkbits; |
| 33 | unsigned int write_blkbits; | ||
| 33 | unsigned int capacity; | 34 | unsigned int capacity; |
| 35 | unsigned int read_partial:1, | ||
| 36 | read_misalign:1, | ||
| 37 | write_partial:1, | ||
| 38 | write_misalign:1; | ||
| 34 | }; | 39 | }; |
| 35 | 40 | ||
| 36 | struct sd_scr { | 41 | struct sd_scr { |