summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/options.44
-rw-r--r--sys/arch/i386/conf/DISKLESS3
-rw-r--r--sys/arch/i386/conf/GENERIC3
3 files changed, 3 insertions, 7 deletions
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 9e6a838e917..1fa0ffe5f70 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: options.4,v 1.102 2002/05/27 23:39:12 tdeval Exp $
+.\" $OpenBSD: options.4,v 1.103 2002/06/17 23:13:02 matthieu Exp $
.\" $NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
.\"
.\" Copyright (c) 1998 Theo de Raadt
@@ -547,8 +547,6 @@ Makes the boot process more verbose for Mac OBIO peripherals.
Provide in-kernel support for VGA framebuffer mapping by user-processes
(such as an X windows server).
This option is supported in the i386 architecture.
-.It Cd option XSERVER
-Support for X windows in the console driver.
.It Cd option LKM
Enables support for loadable kernel modules.
See
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