diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 18:21:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 18:21:22 -0500 |
| commit | 245599f573f302bfa27a0436408c80f13b457046 (patch) | |
| tree | 4683cf7b59ec75b0efd9a1aaf7fc1ecafcbd6f6c /include/linux | |
| parent | 6cec2aed8686840906f6298391dc4fd04d9ba843 (diff) | |
| parent | 5bd546aa78b5d74f3162815e41940f862215d9e3 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
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 f38872abc126..bdc556d88498 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h | |||
| @@ -49,7 +49,7 @@ struct mmc_command { | |||
| 49 | /* | 49 | /* |
| 50 | * These are the command types. | 50 | * These are the command types. |
| 51 | */ | 51 | */ |
| 52 | #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_TYPE) | 52 | #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK) |
| 53 | 53 | ||
| 54 | unsigned int retries; /* max number of retries */ | 54 | unsigned int retries; /* max number of retries */ |
| 55 | unsigned int error; /* command error */ | 55 | unsigned int error; /* command error */ |