diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 12:16:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 12:16:07 -0800 |
| commit | 12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3 (patch) | |
| tree | 158610ef6c7711afb60d78956ab4b131bf6a08ef /include/scsi/scsi_transport.h | |
| parent | 61b7efddc5256225099d13185659e9ad9d8abc8a (diff) | |
| parent | fc091e03820bf67e543362bd40959701a71d0c27 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'include/scsi/scsi_transport.h')
| -rw-r--r-- | include/scsi/scsi_transport.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h index f6e0bb484c6..e7b1054adf8 100644 --- 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 |