7 files changed, 7 insertions, 16 deletions
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index a197c9a..91e2fa1 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.107 1998/04/06 15:42:26 peter Exp $
+ *	$Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -45,7 +45,6 @@
 
 #include "apm.h"
 #include "opt_bootp.h"
-#include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_nfs.h"
 #include "opt_userconfig.h"
diff --git a/sys/i386/isa/bt5xx-445.c b/sys/i386/isa/bt5xx-445.c
index 0bac9ac..212993e 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: bt5xx-445.c,v 1.7 1997/03/23 04:39:30 bde Exp $
+ *      $Id: bt5xx-445.c,v 1.8 1997/07/20 14:09:51 bde Exp $
  */
 
 /*
@@ -38,8 +38,6 @@
 #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/if_ed.c b/sys/i386/isa/if_ed.c
index d5d6ad9..83f537d 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.141 1998/06/07 17:10:26 dfr Exp $
+ *	$Id: if_ed.c,v 1.142 1998/06/17 14:01:00 bde Exp $
  */
 
 /*
@@ -53,7 +53,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 9087bb5..80b8db4 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.74 1998/03/28 13:24:01 bde Exp $
+ *  $Id: if_ep.c,v 1.75 1998/06/07 17:10:28 dfr Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -67,7 +67,6 @@
 #if defined(__FreeBSD__)
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #endif
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 0eb8707..869111f 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.59 1998/04/15 18:58:09 bde Exp $
+ *	$Id: npx.c,v 1.60 1998/04/19 15:39:26 bde Exp $
  */
 
 #include "npx.h"
@@ -46,7 +46,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
-#include <sys/conf.h>
 #include <sys/proc.h>
 #ifdef NPX_DEBUG
 #include <sys/syslog.h>
diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c
index 939f037..3d962e7 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: seagate.c,v 1.27 1997/11/07 09:20:30 phk Exp $
+ * $Id: seagate.c,v 1.28 1998/04/15 17:26:17 bde Exp $
  */
 
 /*
@@ -126,8 +126,6 @@
 
 #include <scsi/scsiconf.h>
 
-#include "ioconf.h"
-
 #ifdef DEBUG
 #   define PRINT(s)     printf s
 #else
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 3971fce..8cf5c6d 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,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: wst.c,v 1.5 1998/06/08 06:18:52 bde Exp $
+ *	$Id: wst.c,v 1.6 1998/06/08 09:47:37 bde Exp $
  */
 
 #include "wdc.h"
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/mtio.h>