From 6526fb8330e51a5c3d25f1d3b506f354a5a3f227 Mon Sep 17 00:00:00 2001
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Sat, 28 Aug 1993 03:07:44 +0000
Subject: [PATCH] Revised drivers from Julian.

---
 sys/i386/eisa/aha1742.c | 6 +++---
 sys/i386/isa/aha1542.c  | 6 +++---
 sys/i386/isa/aha1742.c  | 6 +++---
 sys/i386/isa/bt742a.c   | 6 +++---
 sys/i386/isa/ultra14f.c | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c
index a4591ca6de6..69e02d7838e 100644
--- a/sys/i386/eisa/aha1742.c
+++ b/sys/i386/eisa/aha1742.c
@@ -14,7 +14,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *	$Id: aha1742.c,v 1.7 1993/08/21 20:01:31 rgrimes Exp $
+ *	$Id: aha1742.c,v 1.7 93/08/26 21:12:21 julian Exp Locker: julian $
  */
 
 #include <sys/types.h>
@@ -324,13 +324,13 @@ int	ahb_debug = 0;
 
 struct	scsi_switch	ahb_switch = 
 {
-	"ahb",
 	ahb_scsi_cmd,
 	ahbminphys,
 	0,
 	0,
 	ahb_adapter_info,
-	0,0,0
+	"ahb",
+	0,0
 };
 
 /**/
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 9678e3e4056..11836749470 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *	$Id$
+ *	$Id: aha1542.c,v 1.5 93/08/26 21:12:17 julian Exp Locker: julian $
  */
 
 /*
@@ -376,13 +376,13 @@ long int	aha_adapter_info();
 
 struct	scsi_switch	aha_switch =
 {
-	"aha",
 	aha_scsi_cmd,
 	ahaminphys,
 	0,
 	0,
 	aha_adapter_info,
-	0,0,0
+	"aha",
+	0,0
 };	
 #define AHA_CMD_TIMEOUT_FUDGE	200	/* multiplied to get Secs	*/
 #define AHA_RESET_TIMEOUT	1000000 /* time to wait for reset	*/
diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c
index a4591ca6de6..69e02d7838e 100644
--- a/sys/i386/isa/aha1742.c
+++ b/sys/i386/isa/aha1742.c
@@ -14,7 +14,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *	$Id: aha1742.c,v 1.7 1993/08/21 20:01:31 rgrimes Exp $
+ *	$Id: aha1742.c,v 1.7 93/08/26 21:12:21 julian Exp Locker: julian $
  */
 
 #include <sys/types.h>
@@ -324,13 +324,13 @@ int	ahb_debug = 0;
 
 struct	scsi_switch	ahb_switch = 
 {
-	"ahb",
 	ahb_scsi_cmd,
 	ahbminphys,
 	0,
 	0,
 	ahb_adapter_info,
-	0,0,0
+	"ahb",
+	0,0
 };
 
 /**/
diff --git a/sys/i386/isa/bt742a.c b/sys/i386/isa/bt742a.c
index e846060b855..b9acadadf00 100644
--- a/sys/i386/isa/bt742a.c
+++ b/sys/i386/isa/bt742a.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *	$Id: bt742a.c,v 1.5 1993/08/21 20:01:32 rgrimes Exp $
+ *	$Id: bt742a.c,v 1.13 93/08/26 21:12:24 julian Exp Locker: julian $
  */
 
 /*
@@ -401,13 +401,13 @@ long int bt_adapter_info();
 
 struct	scsi_switch	bt_switch =
 {
-	"bt",
 	bt_scsi_cmd,
 	btminphys,
 	0,
 	0,
 	bt_adapter_info,
-	0,0,0
+	"bt",
+	0,0
 };	
 #define BT_CMD_TIMEOUT_FUDGE 200 /* multiplied to get Secs */
 #define BT_RESET_TIMEOUT 1000000
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c
index d410867f281..e86ade3422b 100644
--- a/sys/i386/isa/ultra14f.c
+++ b/sys/i386/isa/ultra14f.c
@@ -18,7 +18,7 @@
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  * slight mod to make work with 34F as well: Wed Jun  2 18:05:48 WST 1993
  *
- *	$Id: ultra14f.c,v 1.6 1993/08/21 20:01:34 rgrimes Exp $
+ *	$Id: ultra14f.c,v 1.5 93/08/26 21:12:28 julian Exp Locker: julian $
  */
  
 #include <sys/types.h>
@@ -297,13 +297,13 @@ int     uha_debug = 0;
 
 struct  scsi_switch     uha_switch = 
 {
-	"uha",
 	uha_scsi_cmd,
 	uhaminphys,
 	0,
 	0,
 	uha_adapter_info,
-	0,0,0
+	"uha",
+	0,0
 };
 
 /**/