summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-08-27 05:00:35 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-08-27 05:00:35 +0000
commit822bec5638fdf78e325c00bd47e865d24338de74 (patch)
tree3b57ac3d2ea05e7fbe99af7aed89be720fd4030a /sys/conf
parent1dad2e7c680d790f94e498bd2ca16f56fd3710a1 (diff)
Undo changes which were not discussed.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files5
-rw-r--r--sys/conf/param.c4
2 files changed, 2 insertions, 7 deletions
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>