aboutsummaryrefslogtreecommitdiff
path: root/sys/conf/NOTES
diff options
context:
space:
mode:
authorMike Smith <msmith@FreeBSD.org>1998-09-17 03:15:30 +0000
committerMike Smith <msmith@FreeBSD.org>1998-09-17 03:15:30 +0000
commitc009fe307dbfd298c37139424137aad08c78f2ec (patch)
treea6ea5c26152a1f5e267d856f5d3d5079fbb9bdf4 /sys/conf/NOTES
parentd2748a4068db2b895c4a9af2cc6dcf6c20eb13f7 (diff)
downloadsrc-c009fe307dbfd298c37139424137aad08c78f2ec.tar.gz
src-c009fe307dbfd298c37139424137aad08c78f2ec.zip
Mark the syscons and pcvt drivers as being allowed to conflict, so that
well-meaning but uneducated users don't exterminate the psm driver in their zeal to achieve zero conflicts.
Notes
Notes: svn path=/head/; revision=39400
Diffstat (limited to 'sys/conf/NOTES')
-rw-r--r--sys/conf/NOTES6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 8b20f861bacc..24ab9b6f7ee3 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.465 1998/09/15 11:44:43 phk Exp $
+# $Id: LINT,v 1.466 1998/09/15 18:16:36 sos Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -787,14 +787,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
-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 running an X server.
options FAT_CURSOR # start with block cursor
# This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
options PCVT_SCANSET=2 # IBM keyboards are non-std
# The syscons console driver (sco color console compatible).
-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
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in