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

Commit 245599f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 6cec2aed 5bd546aa

include/linux/mmc/mmc.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct mmc_command { 
/*

 * These are the command types.

 */

#define mmc_cmd_type(cmd)	((cmd)->flags & MMC_CMD_TYPE)

#define mmc_cmd_type(cmd)	((cmd)->flags & MMC_CMD_MASK)



	unsigned int		retries;	/* max number of retries */

	unsigned int		error;		/* command error */