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

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index d5fd17ef74db..92d2c8379abf 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -591,8 +591,6 @@ static Scsi_Host_Template driver_template = {
         .queuecommand                   = macscsi_queue_command,
         .eh_abort_handler               = macscsi_abort,
         .eh_bus_reset_handler           = macscsi_bus_reset,
-        .eh_device_reset_handler        = macscsi_device_reset,
-        .eh_host_reset_handler          = macscsi_host_reset,
         .can_queue                      = CAN_QUEUE,
         .this_id                        = 7,
         .sg_tablesize                   = SG_ALL,