diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-28 18:02:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-28 18:02:50 -0500 |
| commit | cba2fa186146aacde99bba3dcd713552dad5a897 (patch) | |
| tree | 6075d20fd169ee076c6728e32340ad69ffc39cb1 /include/linux | |
| parent | 89a1623df6024e3093f6f3336466809d4f003fe7 (diff) | |
| parent | 24117defabc849a6ad5081ad0fafd0664bf55f13 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/protocol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/protocol.h b/include/linux/mmc/protocol.h index f819cae92266..a14dc306545b 100644 --- a/include/linux/mmc/protocol.h +++ b/include/linux/mmc/protocol.h | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | /* class 5 */ | 63 | /* class 5 */ |
| 64 | #define MMC_ERASE_GROUP_START 35 /* ac [31:0] data addr R1 */ | 64 | #define MMC_ERASE_GROUP_START 35 /* ac [31:0] data addr R1 */ |
| 65 | #define MMC_ERASE_GROUP_END 36 /* ac [31:0] data addr R1 */ | 65 | #define MMC_ERASE_GROUP_END 36 /* ac [31:0] data addr R1 */ |
| 66 | #define MMC_ERASE 37 /* ac R1b */ | 66 | #define MMC_ERASE 38 /* ac R1b */ |
| 67 | 67 | ||
| 68 | /* class 9 */ | 68 | /* class 9 */ |
| 69 | #define MMC_FAST_IO 39 /* ac <Complex> R4 */ | 69 | #define MMC_FAST_IO 39 /* ac <Complex> R4 */ |
| @@ -74,7 +74,7 @@ | |||
| 74 | 74 | ||
| 75 | /* class 8 */ | 75 | /* class 8 */ |
| 76 | #define MMC_APP_CMD 55 /* ac [31:16] RCA R1 */ | 76 | #define MMC_APP_CMD 55 /* ac [31:16] RCA R1 */ |
| 77 | #define MMC_GEN_CMD 56 /* adtc [0] RD/WR R1b */ | 77 | #define MMC_GEN_CMD 56 /* adtc [0] RD/WR R1 */ |
| 78 | 78 | ||
| 79 | /* SD commands type argument response */ | 79 | /* SD commands type argument response */ |
| 80 | /* class 8 */ | 80 | /* class 8 */ |