Removed nested #include of <sys/conf.h> from <scsi/scsi_driver.h>

and fixed everything that depended on getting it from the wrong
place.  Most of the broken things actually only depended on getting
the declaration of their interrupt handler from "ioconf.h".

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.66 1997/02/22 09:35:52 peter Exp $
  */
 
 /*
@@ -49,6 +49,8 @@
 #define NAHA 1
 #endif /*KERNEL */
 
+#include "ioconf.h"
+
 /************************** board definitions *******************************/
 
 /*

sys/i386/isa/aic6360.c

@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id$
+ * $Id: aic6360.c,v 1.26 1997/02/22 09:35:55 peter Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -133,6 +133,8 @@
 
 #include <sys/kernel.h>
 
+#include "ioconf.h"
+
 /* Definitions, most of them has turned out to be unneccesary, but here they
  * are anyway.
  */

sys/i386/isa/bt5xx-445.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: bt5xx-445.c,v 1.6 1997/02/22 09:35:58 peter Exp $
  */
 
 /*
@@ -40,6 +40,8 @@
 #include <i386/isa/isa_device.h>
 #include <i386/scsi/btreg.h>
 
+#include "ioconf.h"
+
 static	int bt_isa_probe __P((struct isa_device *dev));
 static	int bt_isa_attach __P((struct isa_device *dev));
 

sys/i386/isa/ncr5380.c

@@ -55,6 +55,8 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
+#include "ioconf.h"
+
 #ifdef DEBUG
 #   define PRINT(s)     printf s
 #else

sys/i386/isa/seagate.c

@@ -60,7 +60,7 @@
  *               that category, with the possible exception of scanners and
  *               some of the older MO drives.
  *
- * $Id$
+ * $Id: seagate.c,v 1.20 1997/02/22 09:37:05 peter Exp $
  */
 
 /*
@@ -133,6 +133,8 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
+#include "ioconf.h"
+
 #ifdef DEBUG
 #   define PRINT(s)     printf s
 #else

sys/i386/isa/ultra14f.c

@@ -22,7 +22,7 @@
  * today: Fri Jun  2 17:21:03 EST 1994
  * added 24F support  ++sg
  *
- *      $Id$
+ *      $Id: ultra14f.c,v 1.51 1997/02/22 09:37:20 peter Exp $
  */
 
 #include <sys/types.h>
@@ -49,6 +49,8 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
+#include "ioconf.h"
+
 /* */
 
 #ifndef	KERNEL

sys/i386/isa/wd7000.c

@@ -71,6 +71,8 @@
 
 #include <i386/isa/isa_device.h>
 
+#include "ioconf.h"
+
 static struct scsi_device wds_dev =
 {
  	NULL,

sys/scsi/ch.c

@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.36 1997/02/22 09:44:25 peter Exp $
+ *      $Id: ch.c,v 1.37 1997/03/06 15:36:14 joerg Exp $
  */
 
 #include "opt_scsi.h"
@@ -45,6 +45,7 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/chio.h>
+#include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #ifdef DEVFS

sys/scsi/scsi_driver.h

@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: scsi_driver.h,v 1.10 1997/02/22 09:44:31 peter Exp $
  *
  */
 #ifndef _SCSI__DRIVER_H_
@@ -43,8 +43,6 @@
 
 #ifdef KERNEL
 
-#include <sys/conf.h>
-
 struct scsi_link;
 struct scsi_device;
 struct buf;