Skip to content

L
linux
Commit 27d1097d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

parents 83928e17 8573b80f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/linux/mmc/mmc.h
View file @ 27d1097d
...@@ -50,7 +50,7 @@ struct mmc_command { ...@@ -50,7 +50,7 @@ struct mmc_command {
#define MMC_ERR_INVALID 5 #define MMC_ERR_INVALID 5
struct mmc_data *data; /* data segment associated with cmd */ struct mmc_data *data; /* data segment associated with cmd */
struct mmc_request *mrq; /* assoicated request */ struct mmc_request *mrq; /* associated request */
}; };
struct mmc_data { struct mmc_data {
...@@ -68,7 +68,7 @@ struct mmc_data { ...@@ -68,7 +68,7 @@ struct mmc_data {
unsigned int bytes_xfered; unsigned int bytes_xfered;
struct mmc_command *stop; /* stop command */ 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 */ unsigned int sg_len; /* size of scatter list */
struct scatterlist *sg; /* I/O scatter list */ struct scatterlist *sg; /* I/O scatter list */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7