diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /drivers/scsi/qlogicfas.c | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/scsi/qlogicfas.c')
| -rw-r--r-- | drivers/scsi/qlogicfas.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c index a1adb38f69bb..55e698b651d6 100644 --- a/drivers/scsi/qlogicfas.c +++ b/drivers/scsi/qlogicfas.c | |||
| @@ -191,8 +191,6 @@ static Scsi_Host_Template qlogicfas_driver_template = { | |||
| 191 | .queuecommand = qlogicfas408_queuecommand, | 191 | .queuecommand = qlogicfas408_queuecommand, |
| 192 | .eh_abort_handler = qlogicfas408_abort, | 192 | .eh_abort_handler = qlogicfas408_abort, |
| 193 | .eh_bus_reset_handler = qlogicfas408_bus_reset, | 193 | .eh_bus_reset_handler = qlogicfas408_bus_reset, |
| 194 | .eh_device_reset_handler= qlogicfas408_device_reset, | ||
| 195 | .eh_host_reset_handler = qlogicfas408_host_reset, | ||
| 196 | .bios_param = qlogicfas408_biosparam, | 194 | .bios_param = qlogicfas408_biosparam, |
| 197 | .can_queue = 1, | 195 | .can_queue = 1, |
| 198 | .this_id = -1, | 196 | .this_id = -1, |