diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:25:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:25:21 -0400 |
| commit | 27d1097d39509494706eaa2620ef3b1e780a3224 (patch) | |
| tree | 69782da9f8f2e5fcf20fa7ce11832085825563af | |
| parent | 83928e17b92b7a667bfe674f1b330619adc2ac88 (diff) | |
| parent | 8573b80f020dce7aefa3237f1e932d562b65323d (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
| -rw-r--r-- | include/linux/mmc/mmc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 1ab78e8d6c53..aef6042f8f0b 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h | |||
| @@ -50,7 +50,7 @@ struct mmc_command { | |||
| 50 | #define MMC_ERR_INVALID 5 | 50 | #define MMC_ERR_INVALID 5 |
| 51 | 51 | ||
| 52 | struct mmc_data *data; /* data segment associated with cmd */ | 52 | struct mmc_data *data; /* data segment associated with cmd */ |
| 53 | struct mmc_request *mrq; /* assoicated request */ | 53 | struct mmc_request *mrq; /* associated request */ |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | struct mmc_data { | 56 | struct mmc_data { |
| @@ -68,7 +68,7 @@ struct mmc_data { | |||
| 68 | unsigned int bytes_xfered; | 68 | unsigned int bytes_xfered; |
| 69 | 69 | ||
| 70 | struct mmc_command *stop; /* stop command */ | 70 | struct mmc_command *stop; /* stop command */ |
| 71 | struct mmc_request *mrq; /* assoicated request */ | 71 | struct mmc_request *mrq; /* associated request */ |
| 72 | 72 | ||
| 73 | unsigned int sg_len; /* size of scatter list */ | 73 | unsigned int sg_len; /* size of scatter list */ |
| 74 | struct scatterlist *sg; /* I/O scatter list */ | 74 | struct scatterlist *sg; /* I/O scatter list */ |