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 /include/linux | |
| parent | Revert "[PATCH] Fix up mmap_kmem" (diff) | |
| parent | mmc: Correct definition of R6 (diff) | |
| download | linux-dev-e55cec4ff1080e36ed1dbfaee46fe05d64f4eae2.tar.xz linux-dev-e55cec4ff1080e36ed1dbfaee46fe05d64f4eae2.zip | |
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 'include/linux')
| -rw-r--r-- | include/linux/mmc/mmc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index a3594dfd6963..bcf24909d677 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -42,7 +42,7 @@ struct mmc_command { #define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) #define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) #define MMC_RSP_R3 (MMC_RSP_PRESENT) -#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC) +#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE) #define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) |