Changed #includes of <i386/include/foo.h> to #includes of <machine/foo.h>.

svn path=/head/; revision=15118

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.

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

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.

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;