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 /drivers | |
| parent | 89a1623df6024e3093f6f3336466809d4f003fe7 (diff) | |
| parent | 24117defabc849a6ad5081ad0fafd0664bf55f13 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index da528390acf8..d336a1d65dc7 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
| @@ -816,7 +816,7 @@ static void mmc_discover_cards(struct mmc_host *host) | |||
| 816 | 816 | ||
| 817 | cmd.opcode = SD_SEND_RELATIVE_ADDR; | 817 | cmd.opcode = SD_SEND_RELATIVE_ADDR; |
| 818 | cmd.arg = 0; | 818 | cmd.arg = 0; |
| 819 | cmd.flags = MMC_RSP_R1; | 819 | cmd.flags = MMC_RSP_R6; |
| 820 | 820 | ||
| 821 | err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES); | 821 | err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES); |
| 822 | if (err != MMC_ERR_NONE) | 822 | if (err != MMC_ERR_NONE) |