summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1999-08-23 13:39:32 +0000
committerkato <kato@FreeBSD.org>1999-08-23 13:39:32 +0000
commit6b9d586de3dd5c58316d2c7686a5e8a66e6ff976 (patch)
tree9745cc99672d78a3787a4d05a47d443ba1d7f4b7
parentc4539c4f54d6750482a52e21bbbe246af237f754 (diff)
downloadFreeBSD-src-6b9d586de3dd5c58316d2c7686a5e8a66e6ff976.zip
FreeBSD-src-6b9d586de3dd5c58316d2c7686a5e8a66e6ff976.tar.gz
Merge from sys/i386/conf/options.i386 revision .1.20.
-rw-r--r--sys/conf/options.pc983
-rw-r--r--sys/pc98/conf/options.pc983
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 8d6f01f..3c46c2d 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.91 1999/06/24 08:31:08 kato Exp $
+# $Id: options.pc98,v 1.92 1999/08/08 11:13:47 kato Exp $
DISABLE_PSE
IDE_DELAY
@@ -9,7 +9,6 @@ PMAP_SHPGPERPROC opt_pmap.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
-LINUX opt_dontuse.h
DEBUG_LINUX opt_linux.h
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 8d6f01f..3c46c2d 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.91 1999/06/24 08:31:08 kato Exp $
+# $Id: options.pc98,v 1.92 1999/08/08 11:13:47 kato Exp $
DISABLE_PSE
IDE_DELAY
@@ -9,7 +9,6 @@ PMAP_SHPGPERPROC opt_pmap.h
IBCS2 opt_dontuse.h
COMPAT_LINUX opt_dontuse.h
-LINUX opt_dontuse.h
DEBUG_LINUX opt_linux.h
OpenPOWER on IntegriCloud