Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[karo-tx-linux.git] / drivers / scsi / dtc.c

diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index da1aaa413fed3ab8011beb81f1a75db959945c48..897743b2334244014b10372b2345dc9e75822d4b 100644 (file)
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -92,10 +92,6 @@
 
 #define DTC_PUBLIC_RELEASE 2
 
-/*#define DTCDEBUG 0x1*/
-#define DTCDEBUG_INIT  0x1
-#define DTCDEBUG_TRANSFER 0x2
-
 /*
  * The DTC3180 & 3280 boards are memory mapped.
  * 
@@ -482,8 +478,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,