diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
| commit | 3afa294c40013be5d8180005002e3f648d04d942 (patch) | |
| tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/scsi/qlogicfas.c | |
| parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
| parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) | |
merge by hand (qla_os.c mismerge)
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, |