summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/machdep.c5
-rw-r--r--sys/i386/i386/machdep.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 3b60112..b434178 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 3b60112..b434178 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>
OpenPOWER on IntegriCloud