From 2a572f9e3209989ed374c21ac1783621abf89177 Mon Sep 17 00:00:00 2001 From: msmith Date: Thu, 17 Sep 1998 03:15:30 +0000 Subject: 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. --- sys/amd64/conf/GENERIC | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/amd64/conf') 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 -- cgit v1.1