diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-06-21 17:46:53 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-06-21 17:46:53 +0000 |
| commit | b391e5cdc4a4fe4c4b4bff06aa186d66b0d84d6a (patch) | |
| tree | 44ff51a19ed55db29025f79db773f4ec159dd046 /sys | |
| parent | 86ef30b746b351b7c790ef0ba897757aad3bf1d3 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 5 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 3b6011240d31..b43417845c36 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.299 1998/06/07 17:10:01 dfr Exp $ + * $Id: machdep.c,v 1.300 1998/06/17 14:57:55 bde Exp $ */ #include "apm.h" @@ -64,7 +64,6 @@ #include <sys/proc.h> #include <sys/buf.h> #include <sys/reboot.h> -#include <sys/conf.h> #include <sys/callout.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -131,7 +130,9 @@ #include <i386/isa/isa_device.h> #include <i386/isa/intr_machdep.h> +#ifndef VM86 #include <i386/isa/rtc.h> +#endif #include <machine/random.h> #include <sys/ptrace.h> diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 3b6011240d31..b43417845c36 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.299 1998/06/07 17:10:01 dfr Exp $ + * $Id: machdep.c,v 1.300 1998/06/17 14:57:55 bde Exp $ */ #include "apm.h" @@ -64,7 +64,6 @@ #include <sys/proc.h> #include <sys/buf.h> #include <sys/reboot.h> -#include <sys/conf.h> #include <sys/callout.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -131,7 +130,9 @@ #include <i386/isa/isa_device.h> #include <i386/isa/intr_machdep.h> +#ifndef VM86 #include <i386/isa/rtc.h> +#endif #include <machine/random.h> #include <sys/ptrace.h> |