Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / include / scsi / scsi_host.h

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index fe3b58e836c881b7598d37c46d56cbd6d1b81b6e..53075e5039e6e3ff2a246064e78394f790abbe69 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -478,6 +478,11 @@ struct scsi_host_template {
        /* True if the controller does not support WRITE SAME */
        unsigned no_write_same:1;
 
+       /*
+        * True if asynchronous aborts are not supported
+        */
+       unsigned no_async_abort:1;
+
        /*
         * Countdown for host blocking with no commands outstanding.
         */
@@ -689,6 +694,11 @@ struct Scsi_Host {
        char work_q_name[20];
        struct workqueue_struct *work_q;
 
+       /*
+        * Task management function work queue
+        */
+       struct workqueue_struct *tmf_work_q;
+
        /*
         * Host has rejected a command because it was busy.
         */