Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / mmc / card.h

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 18fc77f682de8dcf629c83945c4595fd3cc0b82c..991a37382a22e84ec1e15894688046a9e77a077e 100644 (file)
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -28,9 +28,15 @@ struct mmc_csd {
        unsigned short          cmdclass;
        unsigned short          tacc_clks;
        unsigned int            tacc_ns;
+       unsigned int            r2w_factor;
        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 {