Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 83928e17 8573b80f

include/linux/mmc/mmc.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */