diff options
author | msmith <msmith@FreeBSD.org> | 1998-09-17 03:15:30 +0000 |
---|---|---|
committer | msmith <msmith@FreeBSD.org> | 1998-09-17 03:15:30 +0000 |
commit | 2a572f9e3209989ed374c21ac1783621abf89177 (patch) | |
tree | 9765e9f2be095f90bd1f0a5bade51c65edfc0249 /sys/i386/conf/LINT | |
parent | f98d75eac33e9dc1a3b13da9a4297afe575dcb00 (diff) | |
download | FreeBSD-src-2a572f9e3209989ed374c21ac1783621abf89177.zip FreeBSD-src-2a572f9e3209989ed374c21ac1783621abf89177.tar.gz |
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.
Diffstat (limited to 'sys/i386/conf/LINT')
-rw-r--r-- | sys/i386/conf/LINT | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 8b20f86..24ab9b6 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -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 |