summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2002-06-17 23:13:03 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2002-06-17 23:13:03 +0000
commit92aafe69f80ea783f0e75ec9bf5a1dfd906c4d5c (patch)
tree872af1b9f36ee418ad2fb2681973903f637e3ac1 /sys/arch
parent45c192c6b8db8553d2bf9fca747f42c09d6c0865 (diff)
option XSERVER was only needed for pccons console driver, which
has been obsoleted. ok millert@, miod@ and deraadt@.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/DISKLESS3
-rw-r--r--sys/arch/i386/conf/GENERIC3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 62d01daefde..54a87200695 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.42 2002/06/17 19:43:12 deraadt Exp $
+# $OpenBSD: DISKLESS,v 1.43 2002/06/17 23:13:02 matthieu Exp $
# $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
@@ -16,7 +16,6 @@ option GPL_MATH_EMULATE # floating point emulation
#option VM86 # Virtual 8086 emulation
#option USER_LDT # user-settable LDT; used by WINE
-option XSERVER # diddle with console driver
option APERTURE # in-kernel aperture driver for XFree86
#option KGDB # Remote debugger support; exclusive of DDB
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 520944a3baf..a6f2904f212 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.307 2002/06/17 19:42:42 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.308 2002/06/17 23:13:02 matthieu Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -18,7 +18,6 @@ option USER_PCICONF # user-space PCI configuration
#option VM86 # Virtual 8086 emulation
#option USER_LDT # user-settable LDT; used by WINE
-option XSERVER # diddle with console driver
option APERTURE # in-kernel aperture driver for XFree86
#option KGDB # Remote debugger support; exclusive of DDB