Auto merge with /home/aegl/GIT/linus

[linux-2.6-omap-h63xx.git] / drivers / scsi / pcmcia / qlogic_stub.c

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 4766bcd6369265b125eca53cef412afae50d1667..a0175f5d11cd3e2430fada5124a42dc59abd58f6 100644 (file)
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -81,8 +81,6 @@ static Scsi_Host_Template qlogicfas_driver_template = {
        .queuecommand           = qlogicfas408_queuecommand,
        .eh_abort_handler       = qlogicfas408_abort,
        .eh_bus_reset_handler   = qlogicfas408_bus_reset,
-       .eh_device_reset_handler= qlogicfas408_device_reset,
-       .eh_host_reset_handler  = qlogicfas408_host_reset,
        .bios_param             = qlogicfas408_biosparam,
        .can_queue              = 1,
        .this_id                = -1,