diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /drivers/scsi/arm/oak.c | |
parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/scsi/arm/oak.c')
-rw-r--r-- | drivers/scsi/arm/oak.c | 2 |
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 = { | |||
118 | .info = oakscsi_info, | 118 | .info = oakscsi_info, |
119 | .queuecommand = oakscsi_queue_command, | 119 | .queuecommand = oakscsi_queue_command, |
120 | .eh_abort_handler = NCR5380_abort, | 120 | .eh_abort_handler = NCR5380_abort, |
121 | .eh_device_reset_handler= NCR5380_device_reset, | ||
122 | .eh_bus_reset_handler = NCR5380_bus_reset, | 121 | .eh_bus_reset_handler = NCR5380_bus_reset, |
123 | .eh_host_reset_handler = NCR5380_host_reset, | ||
124 | .can_queue = 16, | 122 | .can_queue = 16, |
125 | .this_id = 7, | 123 | .this_id = 7, |
126 | .sg_tablesize = SG_ALL, | 124 | .sg_tablesize = SG_ALL, |