Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index f6e0bb484c63efb9194c8be4ce90bc7b5da0d482..e7b1054adf86b5d3d1003f3be9335d9c158ae18b 100644 (file)
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -30,12 +30,9 @@ struct scsi_transport_template {
        struct transport_container device_attrs;
 
        /*
-        * If set, call target_parent prior to allocating a scsi_target,
-        * so we get the appropriate parent for the target. This function
-        * is required for transports like FC and iSCSI that do not put the
-        * scsi_target under scsi_host.
+        * If set, called from sysfs and legacy procfs rescanning code.
         */
-       struct device *(*target_parent)(struct Scsi_Host *, int, uint);
+       int (*user_scan)(struct Scsi_Host *, uint, uint, uint);
 
        /* The size of the specific transport attribute structure (a
         * space of this size will be left at the end of the