aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 15:02:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 15:02:50 -0800
commitcba2fa186146aacde99bba3dcd713552dad5a897 (patch)
tree6075d20fd169ee076c6728e32340ad69ffc39cb1 /drivers
parent89a1623df6024e3093f6f3336466809d4f003fe7 (diff)
parent24117defabc849a6ad5081ad0fafd0664bf55f13 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index da528390acf..d336a1d65dc 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)