Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[firefly-linux-kernel-4.4.55.git] / include / scsi / scsi_host.h

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index e113c757d555ef097954a4b41137f4d4b5a8f4e1..fcfa3d7f5e7e38f1bffcf50495730f24bb9e6b2b 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -405,11 +405,6 @@ struct scsi_host_template {
        /* If use block layer to manage tags, this is tag allocation policy */
        int tag_alloc_policy;
 
-       /*
-        * Let the block layer assigns tags to all commands.
-        */
-       unsigned use_blk_tags:1;
-
        /*
         * Track QUEUE_FULL events and reduce queue depth on demand.
         */
@@ -673,6 +668,9 @@ struct Scsi_Host {
        unsigned use_blk_mq:1;
        unsigned use_cmd_list:1;
 
+       /* Host responded with short (<36 bytes) INQUIRY result */
+       unsigned short_inquiry:1;
+
        /*
         * Optional work queue to be utilized by the transport
         */