diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1996-04-07 17:50:10 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1996-04-07 17:50:10 +0000 |
| commit | 5670f8fbd756c213db21d342650aa0b399103bfa (patch) | |
| tree | 14e17fb0282e6bc5b3f9cce7e919c4956c52dee0 /sys | |
| parent | 6ffde942bf3c33906c93f86d2e59e4390f939a97 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/fe/if_fe.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/atapi.c | 5 | ||||
| -rw-r--r-- | sys/i386/isa/if_fe.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/wcd.c | 4 |
4 files changed, 12 insertions, 13 deletions
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; |