diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-27 05:00:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-08-27 05:00:35 +0000 |
| commit | 822bec5638fdf78e325c00bd47e865d24338de74 (patch) | |
| tree | 3b57ac3d2ea05e7fbe99af7aed89be720fd4030a | |
| parent | 1dad2e7c680d790f94e498bd2ca16f56fd3710a1 (diff) | |
Undo changes which were not discussed.
| -rw-r--r-- | sys/arch/i386/i386/microtime.s | 4 | ||||
| -rw-r--r-- | sys/conf/files | 5 | ||||
| -rw-r--r-- | sys/conf/param.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_clock.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_ntptime.c | 5 |
5 files changed, 5 insertions, 17 deletions
diff --git a/sys/arch/i386/i386/microtime.s b/sys/arch/i386/i386/microtime.s index 093b813ffb2..3badf053761 100644 --- a/sys/arch/i386/i386/microtime.s +++ b/sys/arch/i386/i386/microtime.s @@ -1,4 +1,4 @@ -/* $OpenBSD: microtime.s,v 1.12 1998/08/27 00:44:38 mickey Exp $ */ +/* $OpenBSD: microtime.s,v 1.13 1998/08/27 05:00:34 deraadt Exp $ */ /* $NetBSD: microtime.s,v 1.16 1995/04/17 12:06:47 cgd Exp $ */ /*- @@ -34,8 +34,6 @@ * 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 9c9165302ab..cf68926ffef 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,11 +1,8 @@ -# $OpenBSD: files,v 1.84 1998/08/27 00:46:28 mickey Exp $ +# $OpenBSD: files,v 1.85 1998/08/27 05:00:09 deraadt 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 TIMEZONE -defopt NTP # generic attributes define disk diff --git a/sys/conf/param.c b/sys/conf/param.c index 2fb8f7056f0..958207f32bb 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -1,4 +1,4 @@ -/* $OpenBSD: param.c,v 1.5 1998/08/27 00:46:29 mickey Exp $ */ +/* $OpenBSD: param.c,v 1.6 1998/08/27 05:00:11 deraadt Exp $ */ /* $NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $ */ /* @@ -41,8 +41,6 @@ * @(#)param.c 7.20 (Berkeley) 6/27/91 */ -#include "opt_timezone.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/socket.h> diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 96a4bb8cab7..18ba59ce7a3 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.19 1998/08/27 00:44:41 mickey Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.20 1998/08/27 05:00:17 deraadt Exp $ */ /* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */ /*- @@ -41,8 +41,6 @@ * @(#)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 9e50525343e..9768d0e7aec 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ntptime.c,v 1.7 1998/08/27 00:44:43 mickey Exp $ */ +/* $OpenBSD: kern_ntptime.c,v 1.8 1998/08/27 05:00:22 deraadt Exp $ */ /* $NetBSD: kern_ntptime.c,v 1.2 1996/03/07 14:31:20 christos Exp $ */ /****************************************************************************** @@ -49,9 +49,6 @@ * 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> |