diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 00:21:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 00:21:22 +0100 |
| commit | 245599f573f302bfa27a0436408c80f13b457046 (patch) | |
| tree | 4683cf7b59ec75b0efd9a1aaf7fc1ecafcbd6f6c | |
| parent | [PATCH] CIFS: CIFSSMBRead was returning an invalid pointer in buf on socket e... (diff) | |
| parent | [MMC] Fix mmc_cmd_type() mask (diff) | |
| download | linux-245599f573f302bfa27a0436408c80f13b457046.tar.xz linux-245599f573f302bfa27a0436408c80f13b457046.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
| -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 { /* * 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 */ |