diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:08:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 15:08:33 -0800 |
| commit | 8e9c238c3884c226f0cddc31cde87dd5df1a6500 (patch) | |
| tree | d6b4bb2f474580fd6f52e70447f8ed79d441a89d /include | |
| parent | f17578decc40df8fceff82b106582e30bdfb3189 (diff) | |
| parent | 7225b3fd0b6e224235fc50a69f70479ff96d5602 (diff) | |
| download | linux-stable-8e9c238c3884c226f0cddc31cde87dd5df1a6500.tar.gz linux-stable-8e9c238c3884c226f0cddc31cde87dd5df1a6500.tar.bz2 linux-stable-8e9c238c3884c226f0cddc31cde87dd5df1a6500.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/mmc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index aef6042f8f0b..ccd3e13de1e8 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -27,14 +27,15 @@ struct mmc_command { #define MMC_RSP_MASK (3 << 0) #define MMC_RSP_CRC (1 << 3) /* expect valid crc */ #define MMC_RSP_BUSY (1 << 4) /* card may send busy */ +#define MMC_RSP_OPCODE (1 << 5) /* response contains opcode */ /* * These are the response types, and correspond to valid bit * patterns of the above flags. One additional valid pattern * is all zeros, which means we don't expect a response. */ -#define MMC_RSP_R1 (MMC_RSP_SHORT|MMC_RSP_CRC) -#define MMC_RSP_R1B (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_BUSY) +#define MMC_RSP_R1 (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_OPCODE) +#define MMC_RSP_R1B (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) #define MMC_RSP_R2 (MMC_RSP_LONG|MMC_RSP_CRC) #define MMC_RSP_R3 (MMC_RSP_SHORT) #define MMC_RSP_R6 (MMC_RSP_SHORT|MMC_RSP_CRC) @@ -64,6 +65,7 @@ struct mmc_data { #define MMC_DATA_WRITE (1 << 8) #define MMC_DATA_READ (1 << 9) #define MMC_DATA_STREAM (1 << 10) +#define MMC_DATA_MULTI (1 << 11) unsigned int bytes_xfered; |