summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds2005-10-28 18:25:21 +0200
committerLinus Torvalds2005-10-28 18:25:21 +0200
commit27d1097d39509494706eaa2620ef3b1e780a3224 (patch)
tree69782da9f8f2e5fcf20fa7ce11832085825563af /include
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[ARM] 3031/1: fix typos in comments of mmc.h (diff)
downloadkernel-qcow2-linux-27d1097d39509494706eaa2620ef3b1e780a3224.tar.gz
kernel-qcow2-linux-27d1097d39509494706eaa2620ef3b1e780a3224.tar.xz
kernel-qcow2-linux-27d1097d39509494706eaa2620ef3b1e780a3224.zip
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'include')
-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 1ab78e8d6c53..aef6042f8f0b 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 */