diff options
| author | phk <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
| commit | ee871b6440719fbe58a0cb8e994ad543265f4e1a (patch) | |
| tree | 5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/i386/isa | |
| parent | f0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff) | |
| download | FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz | |
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/bs/bshw.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/clock.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 2 | ||||
| -rw-r--r-- | sys/i386/isa/wd.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/isa/bs/bshw.c b/sys/i386/isa/bs/bshw.c index 2cfe064..7c97b32 100644 --- a/sys/i386/isa/bs/bshw.c +++ b/sys/i386/isa/bs/bshw.c @@ -43,7 +43,7 @@ #include <i386/isa/bs/bsif.h> #include <i386/isa/bs/bshw.lst> #include <machine/clock.h> -#include <i386/i386/cons.h> +#include <sys/cons.h> #endif static struct bs_softc *gbsc; diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 1c8d8f6..188e20b 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.141 1999/07/28 20:22:30 msmith Exp $ + * $Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $ */ /* @@ -59,10 +59,10 @@ #include <sys/lock.h> #endif #include <sys/sysctl.h> +#include <sys/cons.h> #include <machine/clock.h> #ifdef CLK_CALIBRATION_LOOP -#include <machine/cons.h> #endif #include <machine/cputypes.h> #include <machine/frame.h> diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 8603f37..07851aa 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -141,7 +141,7 @@ #if PCVT_NETBSD > 9 #include "dev/cons.h" #elif PCVT_FREEBSD >= 200 -#include <machine/cons.h> +#include <sys/cons.h> #else #include "i386/i386/cons.h" #endif diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 6a5100a..07ffd23 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.198 1999/05/30 16:52:29 phk Exp $ + * $Id: wd.c,v 1.199 1999/05/31 11:26:36 phk Exp $ */ /* TODO: @@ -79,12 +79,12 @@ #include <sys/buf.h> #include <sys/devicestat.h> #include <sys/malloc.h> +#include <sys/cons.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ #include <machine/bootinfo.h> #include <machine/clock.h> -#include <machine/cons.h> #include <machine/md_var.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> |
