diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-28 15:02:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-28 15:02:50 -0800 |
| commit | cba2fa186146aacde99bba3dcd713552dad5a897 (patch) | |
| tree | 6075d20fd169ee076c6728e32340ad69ffc39cb1 | |
| parent | 89a1623df6024e3093f6f3336466809d4f003fe7 (diff) | |
| parent | 24117defabc849a6ad5081ad0fafd0664bf55f13 (diff) | |
| download | op-kernel-dev-cba2fa186146aacde99bba3dcd713552dad5a897.zip op-kernel-dev-cba2fa186146aacde99bba3dcd713552dad5a897.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
| -rw-r--r-- | drivers/mmc/mmc.c | 2 | ||||
| -rw-r--r-- | include/linux/mmc/protocol.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index da52839..d336a1d 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -816,7 +816,7 @@ static void mmc_discover_cards(struct mmc_host *host) cmd.opcode = SD_SEND_RELATIVE_ADDR; cmd.arg = 0; - cmd.flags = MMC_RSP_R1; + cmd.flags = MMC_RSP_R6; err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES); if (err != MMC_ERR_NONE) diff --git a/include/linux/mmc/protocol.h b/include/linux/mmc/protocol.h index f819cae..a14dc30 100644 --- a/include/linux/mmc/protocol.h +++ b/include/linux/mmc/protocol.h @@ -63,7 +63,7 @@ /* class 5 */ #define MMC_ERASE_GROUP_START 35 /* ac [31:0] data addr R1 */ #define MMC_ERASE_GROUP_END 36 /* ac [31:0] data addr R1 */ -#define MMC_ERASE 37 /* ac R1b */ +#define MMC_ERASE 38 /* ac R1b */ /* class 9 */ #define MMC_FAST_IO 39 /* ac <Complex> R4 */ @@ -74,7 +74,7 @@ /* class 8 */ #define MMC_APP_CMD 55 /* ac [31:16] RCA R1 */ -#define MMC_GEN_CMD 56 /* adtc [0] RD/WR R1b */ +#define MMC_GEN_CMD 56 /* adtc [0] RD/WR R1 */ /* SD commands type argument response */ /* class 8 */ |
