Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / include / scsi / scsi_transport.h

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index af5b3e15e64eb1e4fd47dc8718ea24963119da92..490bd13a634cc7eff4e61bfab5104b1e28047e2a 100644 (file)
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -71,10 +71,16 @@ struct scsi_transport_template {
         * for target drivers.
         */
        int (* it_nexus_response)(struct Scsi_Host *, u64, int);
+
+       /*
+        * Used as callback for the completion of task management
+        * request for target drivers.
+        */
+       int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
 };
 
 #define transport_class_to_shost(tc) \
-       dev_to_shost((tc)->dev)
+       dev_to_shost((tc)->parent)
 
 
 /* Private area maintenance. The driver requested allocations come