aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pas16.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-06-17 19:42:23 -0400
committerJames Bottomley <jejb@titanic.(none)>2005-06-17 19:42:23 -0400
commit3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch)
tree4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/pas16.c
parent9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff)
parentdf0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff)
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/pas16.c')
-rw-r--r--drivers/scsi/pas16.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 7976947c0322..363e0ebd4a39 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -621,8 +621,6 @@ static Scsi_Host_Template driver_template = {
621 .queuecommand = pas16_queue_command, 621 .queuecommand = pas16_queue_command,
622 .eh_abort_handler = pas16_abort, 622 .eh_abort_handler = pas16_abort,
623 .eh_bus_reset_handler = pas16_bus_reset, 623 .eh_bus_reset_handler = pas16_bus_reset,
624 .eh_device_reset_handler = pas16_device_reset,
625 .eh_host_reset_handler = pas16_host_reset,
626 .bios_param = pas16_biosparam, 624 .bios_param = pas16_biosparam,
627 .can_queue = CAN_QUEUE, 625 .can_queue = CAN_QUEUE,
628 .this_id = 7, 626 .this_id = 7,