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/pxamci.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/pxamci.c')
| -rw-r--r-- | drivers/mmc/pxamci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index 45a9283ce49..6073d998b11 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -171,7 +171,7 @@ static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd, #define RSP_TYPE(x) ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE)) switch (RSP_TYPE(mmc_resp_type(cmd))) { - case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */ + case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6, r7 */ cmdat |= CMDAT_RESP_SHORT; break; case RSP_TYPE(MMC_RSP_R3): |