diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:53:40 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-10 07:53:40 -0700 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /include/scsi/scsi_transport_iscsi.h | |
| parent | e0fd9affeb64088eff407dfc98bbd3a5c17ea479 (diff) | |
| parent | e689cf0caf2d5ebcb300fb69887d35c0abdbdb97 (diff) | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/scsi_transport_iscsi.h')
| -rw-r--r-- | include/scsi/scsi_transport_iscsi.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h index 4a58cca2ecc1..d0f1602985e7 100644 --- a/include/scsi/scsi_transport_iscsi.h +++ b/include/scsi/scsi_transport_iscsi.h @@ -471,14 +471,10 @@ iscsi_destroy_flashnode_sess(struct iscsi_bus_flash_session *fnode_sess); extern void iscsi_destroy_all_flashnode(struct Scsi_Host *shost); extern int iscsi_flashnode_bus_match(struct device *dev, struct device_driver *drv); -extern int iscsi_is_flashnode_conn_dev(struct device *dev, void *data); - extern struct device * iscsi_find_flashnode_sess(struct Scsi_Host *shost, void *data, int (*fn)(struct device *dev, void *data)); - extern struct device * -iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess, - void *data, - int (*fn)(struct device *dev, void *data)); +iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess); + #endif |