summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1998-08-27 00:44:44 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1998-08-27 00:44:44 +0000
commit2110bbba1f7606bdf466a78b87c294acd50c6dd0 (patch)
treeb8e4ebd71e53c4a79cceb766cd1c7ecf8f49d4e7
parent94e0861c55b44131547a6cc4101063bd8a6811a5 (diff)
defopt NTP
-rw-r--r--sys/arch/i386/i386/microtime.s4
-rw-r--r--sys/conf/files4
-rw-r--r--sys/kern/kern_clock.c4
-rw-r--r--sys/kern/kern_ntptime.c5
4 files changed, 13 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/microtime.s b/sys/arch/i386/i386/microtime.s
index 6234c91f9ae..093b813ffb2 100644
--- a/sys/arch/i386/i386/microtime.s
+++ b/sys/arch/i386/i386/microtime.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: microtime.s,v 1.11 1998/05/13 19:49:25 mickey Exp $ */
+/* $OpenBSD: microtime.s,v 1.12 1998/08/27 00:44:38 mickey Exp $ */
/* $NetBSD: microtime.s,v 1.16 1995/04/17 12:06:47 cgd Exp $ */
/*-
@@ -34,6 +34,8 @@
* SUCH DAMAGE.
*/
+#include "opt_ntp.h"
+
#include <machine/asm.h>
#include <dev/isa/isareg.h>
#include <i386/isa/timerreg.h>
diff --git a/sys/conf/files b/sys/conf/files
index dfaabfc4bb2..ab24f749cc3 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,8 +1,10 @@
-# $OpenBSD: files,v 1.82 1998/08/24 05:42:18 millert Exp $
+# $OpenBSD: files,v 1.83 1998/08/27 00:44:40 mickey Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
+# MI options
+defopt NTP
# generic attributes
define disk
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index a320ed66805..96a4bb8cab7 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_clock.c,v 1.18 1998/02/08 22:41:34 tholo Exp $ */
+/* $OpenBSD: kern_clock.c,v 1.19 1998/08/27 00:44:41 mickey Exp $ */
/* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */
/*-
@@ -41,6 +41,8 @@
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
*/
+#include "opt_ntp.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/dkstat.h>
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index e88ddc9712d..9e50525343e 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_ntptime.c,v 1.6 1998/02/08 22:41:35 tholo Exp $ */
+/* $OpenBSD: kern_ntptime.c,v 1.7 1998/08/27 00:44:43 mickey Exp $ */
/* $NetBSD: kern_ntptime.c,v 1.2 1996/03/07 14:31:20 christos Exp $ */
/******************************************************************************
@@ -49,6 +49,9 @@
* this routine are used by hardclock() to adjust the phase and
* frequency of the phase-lock loop which controls the system clock.
*/
+
+#include "opt_ntp.h"
+
#include <sys/param.h>
#include <sys/resourcevar.h>
#include <sys/systm.h>