merge by hand (fix up qla_os.c merge error)

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 = {
         .queuecommand                   = dtc_queue_command,
         .eh_abort_handler               = dtc_abort,
         .eh_bus_reset_handler           = dtc_bus_reset,
-        .eh_device_reset_handler        = dtc_device_reset,
-        .eh_host_reset_handler          = dtc_host_reset,
         .bios_param                     = dtc_biosparam,
         .can_queue                      = CAN_QUEUE,
         .this_id                        = 7,