Removed unused #includes of <i386/isa/icu.h> and <i386/isa/icu.h>. icu.h

is only used by the icu support modules and by a few drivers that know
too much about the icu (most only use it to convert `n' to `IRQn').  isa.h
is only used by ioconf.c and by a few drivers that know too much about
isa addresses (a few have to, because config is deficient).

41 files changed, 35 insertions, 97 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index fe858cc..4a053ff 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,11 +35,10 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.191 1996/05/18 03:36:07 dyson Exp $
+ *	$Id: machdep.c,v 1.192 1996/06/08 11:03:01 bde Exp $
  */
 
 #include "npx.h"
-#include "isa.h"
 #include "opt_sysvipc.h"
 #include "opt_ddb.h"
 #include "opt_bounce.h"
@@ -114,7 +113,6 @@
 #include <machine/perfmon.h>
 #endif
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/rtc.h>
 #include <machine/random.h>
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index abdb456..3a2a73c 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.104 1996/06/12 06:52:12 dyson Exp $
+ *	$Id: pmap.c,v 1.105 1996/06/17 03:35:23 dyson Exp $
  */
 
 /*
@@ -93,8 +93,6 @@
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 
-#include <i386/isa/isa.h>
-
 #define PMAP_KEEP_PDIRS
 
 #if defined(DIAGNOSTIC)
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index ac9cfc5..4232069 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.24 1996/04/30 21:37:21 se Exp $
+**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index ac9cfc5..4232069 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.24 1996/04/30 21:37:21 se Exp $
+**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 243c424..8e8f2f3 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.17 1996/03/29 11:39:08 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.18 1996/06/12 04:59:14 gpalmer Exp $
  *
  *  Digiboard driver.
  *
@@ -51,14 +51,12 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <gnu/i386/isa/dgbios.h>
 #include <gnu/i386/isa/dgfep.h>
 #include <gnu/i386/isa/dgreg.h>
 
-
 #define	CALLOUT_MASK		0x80
 #define	CONTROL_MASK		0x60
 #define	CONTROL_INIT_STATE	0x20
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index e4090ff..40734bd 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.98 1996/05/18 17:56:25 se Exp $
+ *	$Id: if_ed.c,v 1.99 1996/05/27 22:32:23 gpalmer Exp $
  */
 
 /*
@@ -79,7 +79,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 #include <i386/isa/if_edreg.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 3f6c1c8..691034c 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.47 1996/06/14 22:11:35 nate Exp $
+ *  $Id: if_ep.c,v 1.48 1996/06/15 00:43:03 nate Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -108,9 +108,7 @@
 #include <machine/clock.h>
 #endif
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_epreg.h>
 #include <i386/isa/elink.h>
 
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index eb7ec89..9b0556c 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.14 1996/04/23 18:36:55 nate Exp $
+ * $Id: if_fe.c,v 1.15 1996/06/12 05:03:40 gpalmer Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -122,7 +122,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 903b1e2..dc45440 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.32 1996/01/26 09:27:26 phk Exp $
+ *	$Id: if_ie.c,v 1.33 1996/02/06 18:50:45 wollman Exp $
  */
 
 /*
@@ -146,11 +146,9 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/i82586.h>
 #include <i386/isa/if_iereg.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_ie507.h>
 #include <i386/isa/elink.h>
 
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index f13b72a..3c10a16 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.79 1996/06/08 09:18:21 bde Exp $
+ *	$Id: mcd.c,v 1.80 1996/06/12 05:03:47 gpalmer Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -71,11 +71,9 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include <i386/i386/cons.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/mcdreg.h>
 
-
 #define	MCD_TRACE(format, args...)						\
 {									\
 	if (mcd_data[unit].debug) {					\
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index b9bd2c4..5614de5 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -53,7 +53,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/sioreg.h>
 
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index 1c43341..f6c15e4 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.20 1996/05/03 16:49:03 phk Exp $ */
+/* $Id: scd.c,v 1.21 1996/06/08 09:18:23 bde Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -72,7 +72,6 @@
 #include <machine/clock.h>
 #include <machine/stdarg.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/scdreg.h>
 
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 243c424..8e8f2f3 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.17 1996/03/29 11:39:08 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.18 1996/06/12 04:59:14 gpalmer Exp $
  *
  *  Digiboard driver.
  *
@@ -51,14 +51,12 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <gnu/i386/isa/dgbios.h>
 #include <gnu/i386/isa/dgfep.h>
 #include <gnu/i386/isa/dgreg.h>
 
-
 #define	CALLOUT_MASK		0x80
 #define	CONTROL_MASK		0x60
 #define	CONTROL_INIT_STATE	0x20
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 3c6fc25..76e4d67 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -14,11 +14,10 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.42 1996/06/04 17:37:46 nate Exp $
+ *	$Id: apm.c,v 1.43 1996/06/04 17:50:28 nate Exp $
  */
 
 #include "apm.h"
-
 #if NAPM > 1
 #error only one APM device may be configured
 #endif
@@ -35,7 +34,6 @@
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include "i386/isa/isa.h"
 #include "i386/isa/isa_device.h"
 #include <machine/apm_bios.h>
 #include <machine/segments.h>
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 3c6fc25..76e4d67 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -14,11 +14,10 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.42 1996/06/04 17:37:46 nate Exp $
+ *	$Id: apm.c,v 1.43 1996/06/04 17:50:28 nate Exp $
  */
 
 #include "apm.h"
-
 #if NAPM > 1
 #error only one APM device may be configured
 #endif
@@ -35,7 +34,6 @@
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include "i386/isa/isa.h"
 #include "i386/isa/isa_device.h"
 #include <machine/apm_bios.h>
 #include <machine/segments.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index fe858cc..4a053ff 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,11 +35,10 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.191 1996/05/18 03:36:07 dyson Exp $
+ *	$Id: machdep.c,v 1.192 1996/06/08 11:03:01 bde Exp $
  */
 
 #include "npx.h"
-#include "isa.h"
 #include "opt_sysvipc.h"
 #include "opt_ddb.h"
 #include "opt_bounce.h"
@@ -114,7 +113,6 @@
 #include <machine/perfmon.h>
 #endif
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/rtc.h>
 #include <machine/random.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index abdb456..3a2a73c 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.104 1996/06/12 06:52:12 dyson Exp $
+ *	$Id: pmap.c,v 1.105 1996/06/17 03:35:23 dyson Exp $
  */
 
 /*
@@ -93,8 +93,6 @@
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 
-#include <i386/isa/isa.h>
-
 #define PMAP_KEEP_PDIRS
 
 #if defined(DIAGNOSTIC)
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index bc15c25..9bd21d7 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.18 1996/04/08 19:40:54 smpatel Exp $
+ * $Id: asc.c,v 1.19 1996/04/13 12:18:43 bde Exp $
  */
 
 #include "asc.h"
@@ -48,7 +48,6 @@
 #include "kernel.h"
 #include "ioctl.h"
 
-#include "i386/isa/isa.h"
 #include "i386/isa/isa_device.h"
 #include "i386/isa/ascreg.h"
 
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index f0079a1..71cc66f 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -62,10 +62,8 @@
 #include <machine/clock.h>
 
 #include <i386/isa/b004.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
-
 static struct kern_devconf kdc_bqu[NBQU] = { {
 	0, 0, 0,		/* filled in by dev_attach */
 	"bqu", 0, { MDDT_ISA, 0 },
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index b56a1f8..296b896 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.16 1995/12/15 00:53:55 bde Exp $
+ *	$Id: ctx.c,v 1.17 1996/03/28 14:28:37 scrappy Exp $
  */
 
 /*
@@ -125,12 +125,10 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ctxreg.h>
 #include <machine/ioctl_ctx.h>
 
-
 static int     waitvb(short);
 
 /* state flags */
diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c
index f191258..8d75a2a 100644
--- a/sys/i386/isa/ft.c
+++ b/sys/i386/isa/ft.c
@@ -17,7 +17,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *
  *  ft.c - QIC-40/80 floppy tape driver
- *  $Id: ft.c,v 1.24 1995/12/10 13:38:31 phk Exp $
+ *  $Id: ft.c,v 1.25 1995/12/15 00:53:58 bde Exp $
  *
  *  01/19/95 ++sg
  *  Cleaned up recalibrate/seek code at attach time for FreeBSD 2.x.
@@ -85,7 +85,6 @@
 #include <i386/isa/isa_device.h>
 #include <i386/isa/fdreg.h>
 #include <i386/isa/fdc.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/rtc.h>
 #include <i386/isa/ftreg.h>
 
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 39bc76e..fbec137 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -43,7 +43,6 @@
 
 #include "i386/isa/gpibreg.h"
 #include "i386/isa/gpib.h"
-#include "i386/isa/isa.h"
 #include "i386/isa/isa_device.h"
 
 #define MIN(a,b) ((a < b) ? a : b)
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index e4090ff..40734bd 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.98 1996/05/18 17:56:25 se Exp $
+ *	$Id: if_ed.c,v 1.99 1996/05/27 22:32:23 gpalmer Exp $
  */
 
 /*
@@ -79,7 +79,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 #include <i386/isa/if_edreg.h>
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index 9c3a81a..07cae48 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_eg.c,v 1.12 1996/02/06 18:50:39 wollman Exp $
+ * $Id: if_eg.c,v 1.13 1996/04/07 17:38:33 bde Exp $
  */
 
 /* To do:
@@ -76,9 +76,7 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_egreg.h>
 
 /* for debugging convenience */
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index a72fc7c..80c6e4d 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.22 1996/01/26 09:27:19 phk Exp $
+ * $Id: if_el.c,v 1.23 1996/02/06 18:50:40 wollman Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -61,9 +61,7 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_elreg.h>
 
 #define ETHER_MIN_LEN	64
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 3f6c1c8..691034c 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.47 1996/06/14 22:11:35 nate Exp $
+ *  $Id: if_ep.c,v 1.48 1996/06/15 00:43:03 nate Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -108,9 +108,7 @@
 #include <machine/clock.h>
 #endif
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_epreg.h>
 #include <i386/isa/elink.h>
 
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index eb7ec89..9b0556c 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.14 1996/04/23 18:36:55 nate Exp $
+ * $Id: if_fe.c,v 1.15 1996/06/12 05:03:40 gpalmer Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -122,7 +122,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 903b1e2..dc45440 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.32 1996/01/26 09:27:26 phk Exp $
+ *	$Id: if_ie.c,v 1.33 1996/02/06 18:50:45 wollman Exp $
  */
 
 /*
@@ -146,11 +146,9 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/i82586.h>
 #include <i386/isa/if_iereg.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_ie507.h>
 #include <i386/isa/elink.h>
 
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 513ea29..5d0473f 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_le.c,v 1.31 1996/03/23 19:34:12 fenner Exp $
+ * $Id: if_le.c,v 1.32 1996/06/12 05:03:42 gpalmer Exp $
  */
 
 /*
@@ -78,7 +78,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
 
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index f5d53fe..1f151c8 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.19 1996/06/04 21:41:01 nate Exp $
+ *	$Id: if_zp.c,v 1.20 1996/06/12 05:03:46 gpalmer Exp $
  */
 /*-
  * TODO:
@@ -145,9 +145,7 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/if_zpreg.h>
 #include <i386/isa/pcic.h>
 
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index bfe605e..88fd624 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.2 1996/05/04 08:49:40 peter Exp $
+ * $Id: istallion.c,v 1.3 1996/06/12 04:26:35 gpalmer Exp $
  */
 
 /*****************************************************************************/
@@ -57,7 +57,6 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <machine/cdk.h>
 #include <machine/comstats.h>
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index f13b72a..3c10a16 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.79 1996/06/08 09:18:21 bde Exp $
+ *	$Id: mcd.c,v 1.80 1996/06/12 05:03:47 gpalmer Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -71,11 +71,9 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include <i386/i386/cons.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/mcdreg.h>
 
-
 #define	MCD_TRACE(format, args...)						\
 {									\
 	if (mcd_data[unit].debug) {					\
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index ac9cfc5..4232069 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.24 1996/04/30 21:37:21 se Exp $
+**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/i386/isa/pcicx.c b/sys/i386/isa/pcicx.c
index 4e4953d..cfcfb38 100644
--- a/sys/i386/isa/pcicx.c
+++ b/sys/i386/isa/pcicx.c
@@ -42,9 +42,7 @@
 #include <sys/kernel.h>
 #include <machine/clock.h>
 #endif
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
-#include <i386/isa/icu.h>
 #include <i386/isa/pcic.h>
 
 /*
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index b9bd2c4..5614de5 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -53,7 +53,6 @@
 
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/sioreg.h>
 
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 1c43341..f6c15e4 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.20 1996/05/03 16:49:03 phk Exp $ */
+/* $Id: scd.c,v 1.21 1996/06/08 09:18:23 bde Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -72,7 +72,6 @@
 #include <machine/clock.h>
 #include <machine/stdarg.h>
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/scdreg.h>
 
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index be46e0e..00b6d6e 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -72,10 +72,8 @@ error "Can only have 1 spigot configured."
 #include	<machine/spigot.h>
 #include	<machine/psl.h>
 
-#include	<i386/isa/isa.h>
 #include	<i386/isa/isa_device.h>
 
-
 static struct spigot_softc {
 	u_long		flags;
 	u_long	 	maddr;
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index ac9cfc5..4232069 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.24 1996/04/30 21:37:21 se Exp $
+**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index ac9cfc5..4232069 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.24 1996/04/30 21:37:21 se Exp $
+**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index ac9cfc5..4232069 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.24 1996/04/30 21:37:21 se Exp $
+**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/pci/if_pdq.c b/sys/pci/if_pdq.c
index efb6114..4c749bb 100644
--- a/sys/pci/if_pdq.c
+++ b/sys/pci/if_pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_pdq.c,v 1.14 1996/02/06 18:51:25 wollman Exp $
+ * $Id: if_pdq.c,v 1.15 1996/03/23 19:29:10 fenner Exp $
  *
  */
 
@@ -95,7 +95,6 @@
 #endif
 
 #if NFEA > 0
-#include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
 #ifdef __FreeBSD__
 #include <sys/devconf.h>