Merge master.kernel.org:/home/rmk/linux-2.6-mmc

245599f5 · Linus Torvalds · 6cec2aed · 5bd546aa · 245599f5
Commit 245599f5 authored Feb 22, 2006 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/linux/mmc/mmc.h include/linux/mmc/mmc.h +1 -1

No files found.
--- 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 */