Skip to content

L
linux-davinci
Commit 245599f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 6cec2aed 5bd546aa
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/linux/mmc/mmc.h
View file @ 245599f5
...@@ -49,7 +49,7 @@ struct mmc_command { ...@@ -49,7 +49,7 @@ struct mmc_command {
/* /*
* These are the command types. * 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 retries; /* max number of retries */
unsigned int error; /* command error */ unsigned int error; /* command error */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment