From 28bc25c4864649f6a87028570dd1baea884be78c Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 9 Jan 2006 22:51:46 +0000 Subject: [PATCH] --- yaml --- r: 17399 b: refs/heads/master c: 7225b3fd0b6e224235fc50a69f70479ff96d5602 h: refs/heads/master i: 17397: d5d8b2aa7fcdfc7508f3870b8dd40274736e67c8 17395: 6ca3f2d8f0a81faf67d2910af267ed95150a9ff5 17391: e9ec1ff0f19c4264695549d9ea77c03c72b397aa v: v3 --- [refs] | 2 +- trunk/include/linux/mmc/mmc.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 896d5ea86b83..e01297c017ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 788ee7b09883515f3a72a8f2a980df5e94f37e2c +refs/heads/master: 7225b3fd0b6e224235fc50a69f70479ff96d5602 diff --git a/trunk/include/linux/mmc/mmc.h b/trunk/include/linux/mmc/mmc.h index 86d491b3b73f..ccd3e13de1e8 100644 --- a/trunk/include/linux/mmc/mmc.h +++ b/trunk/include/linux/mmc/mmc.h @@ -27,14 +27,15 @@ struct mmc_command { #define MMC_RSP_MASK (3 << 0) #define MMC_RSP_CRC (1 << 3) /* expect valid crc */ #define MMC_RSP_BUSY (1 << 4) /* card may send busy */ +#define MMC_RSP_OPCODE (1 << 5) /* response contains opcode */ /* * These are the response types, and correspond to valid bit * patterns of the above flags. One additional valid pattern * is all zeros, which means we don't expect a response. */ -#define MMC_RSP_R1 (MMC_RSP_SHORT|MMC_RSP_CRC) -#define MMC_RSP_R1B (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_BUSY) +#define MMC_RSP_R1 (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_OPCODE) +#define MMC_RSP_R1B (MMC_RSP_SHORT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) #define MMC_RSP_R2 (MMC_RSP_LONG|MMC_RSP_CRC) #define MMC_RSP_R3 (MMC_RSP_SHORT) #define MMC_RSP_R6 (MMC_RSP_SHORT|MMC_RSP_CRC)