diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/fcal.c | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/fcal.c')
| -rw-r--r-- | drivers/scsi/fcal.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c index 0dad89d4cb3e..a6f120dcdfc3 100644 --- a/drivers/scsi/fcal.c +++ b/drivers/scsi/fcal.c | |||
| @@ -311,7 +311,6 @@ static Scsi_Host_Template driver_template = { | |||
| 311 | .use_clustering = ENABLE_CLUSTERING, | 311 | .use_clustering = ENABLE_CLUSTERING, |
| 312 | .eh_abort_handler = fcp_scsi_abort, | 312 | .eh_abort_handler = fcp_scsi_abort, |
| 313 | .eh_device_reset_handler = fcp_scsi_dev_reset, | 313 | .eh_device_reset_handler = fcp_scsi_dev_reset, |
| 314 | .eh_bus_reset_handler = fcp_scsi_bus_reset, | ||
| 315 | .eh_host_reset_handler = fcp_scsi_host_reset, | 314 | .eh_host_reset_handler = fcp_scsi_host_reset, |
| 316 | }; | 315 | }; |
| 317 | #include "scsi_module.c" | 316 | #include "scsi_module.c" |