Merge ../to-linus-stable/

[linux-2.6] / drivers / scsi / pas16.c

diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 7976947c03225670d6c511b315c43b6eb1e401fd..72bc947e45b6481a1d7e21361a72f9914c5519e1 100644 (file)
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -2,6 +2,7 @@
 #define PSEUDO_DMA
 #define FOO
 #define UNSAFE  /* Not unsafe for PAS16 -- use it */
+#define PDEBUG 0
 
 /*
  * This driver adapted from Drew Eckhardt's Trantor T128 driver
@@ -621,8 +622,6 @@ static Scsi_Host_Template driver_template = {
        .queuecommand   = pas16_queue_command,
        .eh_abort_handler = pas16_abort,
        .eh_bus_reset_handler = pas16_bus_reset,
-       .eh_device_reset_handler = pas16_device_reset,
-       .eh_host_reset_handler = pas16_host_reset,
        .bios_param     = pas16_biosparam, 
        .can_queue      = CAN_QUEUE,
        .this_id        = 7,