[src/trunk]: src/sys/arch/i386/conf Comment out XSERVER and XSERVER_DDB and m...

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/78ae42dee201
branches:  trunk
changeset: 486148:78ae42dee201
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun May 14 04:36:09 2000 +0000

description:
Comment out XSERVER and XSERVER_DDB and move them to the pccons-specific
section. They are not used with wscons.

diffstat:

 sys/arch/i386/conf/GENERIC |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r 721a07ffb9a0 -r 78ae42dee201 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun May 14 03:44:02 2000 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun May 14 04:36:09 2000 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.336 2000/05/08 18:41:26 joda Exp $
+#      $NetBSD: GENERIC,v 1.337 2000/05/14 04:36:09 jhawk Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.336 $"
+#ident                 "GENERIC-$Revision: 1.337 $"
 
 maxusers       32              # estimated number of users
 
@@ -25,10 +25,6 @@
 # delay between "rebooting ..." message and hardware reset, in milliseconds
 #options       CPURESET_DELAY=2000
 
-# Misc. i386-specific options
-options        XSERVER         # X server support in console drivers
-#options       XSERVER_DDB     # PF12 gets you into DDB when X is running
-
 # This option allows you to force a serial console at the specified
 # I/O address.   see console(4) for details.
 #options       "CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
@@ -276,12 +272,16 @@
 # ISA console.  You can only configure one of these!
 #pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
 #vt0   at isa? port 0x60 irq 1         # PCVT console driver
-
 # Keyboard layout configuration for pccons
 #options       FRENCH_KBD
 #options       FINNISH_KBD
 #options       GERMAN_KBD
 #options       NORWEGIAN_KBD
+# pccons-specific option:
+#options       XSERVER_DDB     # PF12 gets you into DDB when X is running
+# pccons/pcvt -specific option:
+#options       XSERVER         # X server support
+
 
 # wscons
 pckbc0         at isa?                 # pc keyboard controller