summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 09:25:21 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 09:25:21 -0700
commit27d1097d39509494706eaa2620ef3b1e780a3224 (patch)
tree69782da9f8f2e5fcf20fa7ce11832085825563af
parent83928e17b92b7a667bfe674f1b330619adc2ac88 (diff)
parent8573b80f020dce7aefa3237f1e932d562b65323d (diff)
downloadop-kernel-dev-27d1097d39509494706eaa2620ef3b1e780a3224.zip
op-kernel-dev-27d1097d39509494706eaa2620ef3b1e780a3224.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
-rw-r--r--include/linux/mmc/mmc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 1ab78e8..aef6042 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -50,7 +50,7 @@ struct mmc_command {
#define MMC_ERR_INVALID 5
struct mmc_data *data; /* data segment associated with cmd */
- struct mmc_request *mrq; /* assoicated request */
+ struct mmc_request *mrq; /* associated request */
};
struct mmc_data {
@@ -68,7 +68,7 @@ struct mmc_data {
unsigned int bytes_xfered;
struct mmc_command *stop; /* stop command */
- struct mmc_request *mrq; /* assoicated request */
+ struct mmc_request *mrq; /* associated request */
unsigned int sg_len; /* size of scatter list */
struct scatterlist *sg; /* I/O scatter list */
OpenPOWER on IntegriCloud