From 5670f8fbd756c213db21d342650aa0b399103bfa Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 7 Apr 1996 17:50:10 +0000
Subject: Changed #includes of <i386/include/foo.h> to #includes of
 <machine/foo.h>.

---
 sys/dev/fe/if_fe.c   | 8 +++-----
 sys/i386/isa/atapi.c | 5 +++--
 sys/i386/isa/if_fe.c | 8 +++-----
 sys/i386/isa/wcd.c   | 4 +++-
 4 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 25788670cdc49..c6eb9514dabe1 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id:$
+ * $Id: if_fe.c,v 1.12 1996/03/17 08:36:36 jkh Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -133,15 +133,13 @@
 #include <pccard/card.h>
 #include <pccard/slot.h>
 #include <pccard/driver.h>
+
+#include <machine/laptops.h>
 #endif /* NCRD > 0 */
 
 #include <i386/isa/ic/mb86960.h>
 #include <i386/isa/if_fereg.h>
 
-#if NCRD > 0
-#include <i386/include/laptops.h>
-#endif /* NCRD > 0 */
-
 /*
  * This version of fe is an ISA device driver.
  * Override the following macro to adapt it to another bus.
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index 09c29c228fb9f..6fdbc813aec7d 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -112,8 +112,9 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <i386/include/cpufunc.h>
-#include <i386/include/clock.h>
+
+#include <machine/clock.h>
+#include <machine/cpufunc.h>
 
 #ifdef ATAPI_MODULE
 #   define ATAPI_STATIC
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 25788670cdc49..c6eb9514dabe1 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id:$
+ * $Id: if_fe.c,v 1.12 1996/03/17 08:36:36 jkh Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -133,15 +133,13 @@
 #include <pccard/card.h>
 #include <pccard/slot.h>
 #include <pccard/driver.h>
+
+#include <machine/laptops.h>
 #endif /* NCRD > 0 */
 
 #include <i386/isa/ic/mb86960.h>
 #include <i386/isa/if_fereg.h>
 
-#if NCRD > 0
-#include <i386/include/laptops.h>
-#endif /* NCRD > 0 */
-
 /*
  * This version of fe is an ISA device driver.
  * Override the following macro to adapt it to another bus.
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index b95a3a0398887..b2b7b62429683 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -33,7 +33,9 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <i386/include/cpufunc.h>
+
+#include <machine/cpufunc.h>
+
 #include <i386/isa/atapi.h>
 
 static	d_open_t	wcdropen;
-- 
cgit v1.3