aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-22 15:21:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-22 15:21:22 -0800
commit245599f573f302bfa27a0436408c80f13b457046 (patch)
tree4683cf7b59ec75b0efd9a1aaf7fc1ecafcbd6f6c
parent6cec2aed8686840906f6298391dc4fd04d9ba843 (diff)
parent5bd546aa78b5d74f3162815e41940f862215d9e3 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
-rw-r--r--include/linux/mmc/mmc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index f38872abc12..bdc556d8849 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -49,7 +49,7 @@ struct mmc_command {
/*
* These are the command types.
*/
-#define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_TYPE)
+#define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
unsigned int retries; /* max number of retries */
unsigned int error; /* command error */