Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 27271bfc01d7..26498553a7cc 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -244,9 +244,7 @@ static Scsi_Host_Template cumanascsi_template = {
         .info                   = cumanascsi_info,
         .queuecommand           = cumanascsi_queue_command,
         .eh_abort_handler       = NCR5380_abort,
-        .eh_device_reset_handler= NCR5380_device_reset,
         .eh_bus_reset_handler   = NCR5380_bus_reset,
-        .eh_host_reset_handler  = NCR5380_host_reset,
         .can_queue              = 16,
         .this_id                = 7,
         .sg_tablesize           = SG_ALL,