Merge tag 'v3.10.71' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / sd.h

diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 74a1e4ca5401f9a58e6e705bb2fc8a99fcd04a0f..17f2eeae1263b31d006122fbb05d2719c1ba0e83 100644 (file)
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -69,10 +69,14 @@ struct scsi_disk {
        unsigned int    max_medium_access_timeouts;
        unsigned int    medium_access_timed_out;
        u8              media_present;
+#ifdef CONFIG_MTK_MULTI_PARTITION_MOUNT_ONLY_SUPPORT   
+       u8              old_media_present;  //add for sdcard hotplug
+#endif 
        u8              write_prot;
        u8              protection_type;/* Data Integrity Field */
        u8              provisioning_mode;
        unsigned        ATO : 1;        /* state of disk ATO bit */
+       unsigned        cache_override : 1; /* temp override of WCE,RCD */
        unsigned        WCE : 1;        /* state of disk WCE bit */
        unsigned        RCD : 1;        /* state of disk RCD bit, unused */
        unsigned        DPOFUA : 1;     /* state of disk DPOFUA bit */
@@ -83,6 +87,7 @@ struct scsi_disk {
        unsigned        lbpws : 1;
        unsigned        lbpws10 : 1;
        unsigned        lbpvpd : 1;
+       unsigned        ws10 : 1;
        unsigned        ws16 : 1;
 };
 #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)