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

2006-01-07 10:43:40 -08:00
parent d354d9afe9 f3e2628bed
commit f9c5d0451b
6 changed files with 172 additions and 84 deletions
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -30,7 +30,12 @@ struct mmc_csd {
 	unsigned int		tacc_ns;
 	unsigned int		max_dtr;
 	unsigned int		read_blkbits;
+	unsigned int		write_blkbits;
 	unsigned int		capacity;
+	unsigned int		read_partial:1,
+				read_misalign:1,
+				write_partial:1,
+				write_misalign:1;
 };

 struct sd_scr {