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/dtc.c | |
parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) |
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'drivers/scsi/dtc.c')
-rw-r--r-- | drivers/scsi/dtc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index da1aaa413fed..ab9de39bb50b 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c | |||
@@ -482,8 +482,6 @@ static Scsi_Host_Template driver_template = { | |||
482 | .queuecommand = dtc_queue_command, | 482 | .queuecommand = dtc_queue_command, |
483 | .eh_abort_handler = dtc_abort, | 483 | .eh_abort_handler = dtc_abort, |
484 | .eh_bus_reset_handler = dtc_bus_reset, | 484 | .eh_bus_reset_handler = dtc_bus_reset, |
485 | .eh_device_reset_handler = dtc_device_reset, | ||
486 | .eh_host_reset_handler = dtc_host_reset, | ||
487 | .bios_param = dtc_biosparam, | 485 | .bios_param = dtc_biosparam, |
488 | .can_queue = CAN_QUEUE, | 486 | .can_queue = CAN_QUEUE, |
489 | .this_id = 7, | 487 | .this_id = 7, |