diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /drivers/scsi/iscsi_tcp.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/scsi/iscsi_tcp.c')
| -rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 8a89ba900588..249053a9d4fa 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
| @@ -874,7 +874,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { | |||
| 874 | .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN, | 874 | .cmd_per_lun = ISCSI_DEF_CMD_PER_LUN, |
| 875 | .eh_abort_handler = iscsi_eh_abort, | 875 | .eh_abort_handler = iscsi_eh_abort, |
| 876 | .eh_device_reset_handler= iscsi_eh_device_reset, | 876 | .eh_device_reset_handler= iscsi_eh_device_reset, |
| 877 | .eh_target_reset_handler= iscsi_eh_target_reset, | 877 | .eh_target_reset_handler = iscsi_eh_recover_target, |
| 878 | .use_clustering = DISABLE_CLUSTERING, | 878 | .use_clustering = DISABLE_CLUSTERING, |
| 879 | .slave_alloc = iscsi_sw_tcp_slave_alloc, | 879 | .slave_alloc = iscsi_sw_tcp_slave_alloc, |
| 880 | .slave_configure = iscsi_sw_tcp_slave_configure, | 880 | .slave_configure = iscsi_sw_tcp_slave_configure, |