diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 08:54:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 08:54:48 -0800 |
commit | e55cec4ff1080e36ed1dbfaee46fe05d64f4eae2 (patch) | |
tree | a099822ac61fcde695f090a34ed277b81b566d87 /drivers/mmc/imxmmc.c | |
parent | 6d3154cc1143f62c3b80d9929caeaec6db8cb451 (diff) | |
parent | 6f949909e8f9e5d7e5584dc48d9a5e060c52aed1 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: Correct definition of R6
omap: Update MMC response types
Diffstat (limited to 'drivers/mmc/imxmmc.c')
-rw-r--r-- | drivers/mmc/imxmmc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c index 06e7fcd1922..bfb9ff69320 100644 --- a/drivers/mmc/imxmmc.c +++ b/drivers/mmc/imxmmc.c @@ -351,9 +351,6 @@ static void imxmci_start_cmd(struct imxmci_host *host, struct mmc_command *cmd, case MMC_RSP_R3: /* short */ cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3; break; - case MMC_RSP_R6: /* short CRC */ - cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6; - break; default: break; } |