summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64/conf')
-rw-r--r--sys/amd64/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6d75391..59e1e19 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.115 1998/09/04 19:55:51 msmith Exp $
+# $Id: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
machine "i386"
cpu "I386_CPU"
@@ -109,9 +109,9 @@ controller matcd0 at isa? port 0x230 bio
device scd0 at isa? port 0x230 bio
# syscons is the default console driver, resembling an SCO console
-device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
+device sc0 at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint
+#device vt0 at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
#options XSERVER # support for X server
#options FAT_CURSOR # start with block cursor
# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
OpenPOWER on IntegriCloud