diff options
author | bde <bde@FreeBSD.org> | 1997-03-23 04:40:00 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-03-23 04:40:00 +0000 |
commit | d12a47b40b3e8d17f0fc52d557d1e8974cf57d00 (patch) | |
tree | 386aa84a2adecea30287fc4af2f8b3e7403f6426 /sys/i386 | |
parent | 3676c95c1e887bccd9a3064068e7f428325258bc (diff) | |
download | FreeBSD-src-d12a47b40b3e8d17f0fc52d557d1e8974cf57d00.zip FreeBSD-src-d12a47b40b3e8d17f0fc52d557d1e8974cf57d00.tar.gz |
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".
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/isa/aha1542.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/aic6360.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/bt5xx-445.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/ncr5380.c | 2 | ||||
-rw-r--r-- | sys/i386/isa/seagate.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/ultra14f.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wd7000.c | 2 |
7 files changed, 19 insertions, 5 deletions
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index c6c9550..517882b 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.66 1997/02/22 09:35:52 peter Exp $ */ /* @@ -49,6 +49,8 @@ #define NAHA 1 #endif /*KERNEL */ +#include "ioconf.h" + /************************** board definitions *******************************/ /* diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index 84a4c4b..ee3f13f 100644 --- a/sys/i386/isa/aic6360.c +++ b/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. */ diff --git a/sys/i386/isa/bt5xx-445.c b/sys/i386/isa/bt5xx-445.c index 0877a41..cd6f23f 100644 --- a/sys/i386/isa/bt5xx-445.c +++ b/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)); diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c index 2b0dbf7..5a335e0 100644 --- a/sys/i386/isa/ncr5380.c +++ b/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 diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c index 2bdc48c..dff3dba 100644 --- a/sys/i386/isa/seagate.c +++ b/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 diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 08204cd..86316f2 100644 --- a/sys/i386/isa/ultra14f.c +++ b/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 diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c index 22bd0e2..c6175e6 100644 --- a/sys/i386/isa/wd7000.c +++ b/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, |