Merge upstream kernel changes into 'C/H/S support' branch of libata.

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index ff2554f4cb80..de24bb991f1d 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -118,9 +118,7 @@ static Scsi_Host_Template oakscsi_template = {
         .info                   = oakscsi_info,
         .queuecommand           = oakscsi_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,