diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/dmx3191d.c | |
parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/dmx3191d.c')
-rw-r--r-- | drivers/scsi/dmx3191d.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c index 1d2242403db8..7905b904e01d 100644 --- a/drivers/scsi/dmx3191d.c +++ b/drivers/scsi/dmx3191d.c | |||
@@ -61,8 +61,6 @@ static struct scsi_host_template dmx3191d_driver_template = { | |||
61 | .queuecommand = NCR5380_queue_command, | 61 | .queuecommand = NCR5380_queue_command, |
62 | .eh_abort_handler = NCR5380_abort, | 62 | .eh_abort_handler = NCR5380_abort, |
63 | .eh_bus_reset_handler = NCR5380_bus_reset, | 63 | .eh_bus_reset_handler = NCR5380_bus_reset, |
64 | .eh_device_reset_handler= NCR5380_device_reset, | ||
65 | .eh_host_reset_handler = NCR5380_host_reset, | ||
66 | .can_queue = 32, | 64 | .can_queue = 32, |
67 | .this_id = 7, | 65 | .this_id = 7, |
68 | .sg_tablesize = SG_ALL, | 66 | .sg_tablesize = SG_ALL, |