summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qlogicfas.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
committer <ralf@linux-mips.org>1997-04-29 21:13:14 +0000
commit19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch)
tree40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/scsi/qlogicfas.c
parent7206675c40394c78a90e74812bbdbf8cf3cca1be (diff)
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/scsi/qlogicfas.c')
-rw-r--r--drivers/scsi/qlogicfas.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index a3784e926..e01cd5e2a 100644
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -18,7 +18,7 @@
Reference Qlogic FAS408 Technical Manual, 53408-510-00A, May 10, 1994
(you can reference it, but it is incomplete and inaccurate in places)
- Version 0.45 6/9/96 - kernel 1.2.0+
+ Version 0.46 1/30/97 - kernel 1.2.0+
Functions as standalone, loadable, and PCMCIA driver, the latter from
Dave Hind's PCMCIA package.
@@ -130,7 +130,7 @@
#include "qlogicfas.h"
#include<linux/stat.h>
-struct proc_dir_entry proc_scsi_qlogicfas = {
+static struct proc_dir_entry proc_scsi_qlogicfas = {
PROC_SCSI_QLOGICFAS, 6, "qlogicfas",
S_IFDIR | S_IRUGO | S_IXUGO, 2
};
@@ -620,7 +620,7 @@ host->proc_dir = &proc_scsi_qlogicfas;
if( qlirq != -1 )
hreg->irq = qlirq;
- sprintf(qinfo, "Qlogicfas Driver version 0.45, chip %02X at %03X, IRQ %d, TPdma:%d",
+ sprintf(qinfo, "Qlogicfas Driver version 0.46, chip %02X at %03X, IRQ %d, TPdma:%d",
qltyp, qbase, qlirq, QL_TURBO_PDMA );
host->name = qinfo;
@@ -656,7 +656,7 @@ int qlogicfas_abort(Scsi_Cmnd * cmd)
/*----------------------------------------------------------------*/
/* reset SCSI bus */
-int qlogicfas_reset(Scsi_Cmnd * cmd)
+int qlogicfas_reset(Scsi_Cmnd * cmd, unsigned int ignored)
{
qabort = 2;
ql_zap();