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 2386aeb41fe8d74826908d3dca71eb3f97a59ac8..17f2eeae1263b31d006122fbb05d2719c1ba0e83 100644 (file)
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -69,6 +69,9 @@ 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;
@@ -84,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)