diff options
author | bde <bde@FreeBSD.org> | 1995-07-11 17:20:20 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-07-11 17:20:20 +0000 |
commit | 7654eb453854f4d047720e71b5c0a34b53ab74cb (patch) | |
tree | 25bdbb944fe3d90a1733c0823aebba4d7d0a61f0 /sys/i386 | |
parent | c2f0020e47ac26cc4d8d1798c9976975e8b8c26a (diff) | |
download | FreeBSD-src-7654eb453854f4d047720e71b5c0a34b53ab74cb.zip FreeBSD-src-7654eb453854f4d047720e71b5c0a34b53ab74cb.tar.gz |
Enable pcvt in LINT and don't generate a compile time error if syscons
and pcvt are both configured when LINT is defined. There will be a
link time error instead. This is to test building of pcvt more often.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/LINT | 10 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 10 | ||||
-rw-r--r-- | sys/i386/i386/conf.c | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 27f4ffa..7f32802 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.184 1995/05/28 13:24:16 rgrimes Exp $ +# $Id: LINT,v 1.185 1995/06/22 10:56:47 dfr 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 @@ -392,10 +392,10 @@ options BOUNCE_BUFFERS #options "BROKEN_KEYBOARD_RESET" # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver -#device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#options "PCVT_FREEBSD=210" # pcvt running on FreeBSD 2.0.5 -#options XSERVER # include code for XFree86 -#options FAT_CURSOR # start with block cursor +device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint +options "PCVT_FREEBSD=210" # pcvt running on FreeBSD 2.0.5 +options XSERVER # include code for XFree86 +options FAT_CURSOR # start with block cursor # The syscons console driver (sco color console compatible) - default. device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 27f4ffa..7f32802 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/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.184 1995/05/28 13:24:16 rgrimes Exp $ +# $Id: LINT,v 1.185 1995/06/22 10:56:47 dfr 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 @@ -392,10 +392,10 @@ options BOUNCE_BUFFERS #options "BROKEN_KEYBOARD_RESET" # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver -#device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#options "PCVT_FREEBSD=210" # pcvt running on FreeBSD 2.0.5 -#options XSERVER # include code for XFree86 -#options FAT_CURSOR # start with block cursor +device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint +options "PCVT_FREEBSD=210" # pcvt running on FreeBSD 2.0.5 +options XSERVER # include code for XFree86 +options FAT_CURSOR # start with block cursor # The syscons console driver (sco color console compatible) - default. device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 1b00786..48011f76 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.84 1995/04/28 00:51:30 dufault Exp $ + * $Id: conf.c,v 1.85 1995/05/30 07:59:16 rgrimes Exp $ */ #include <sys/param.h> @@ -422,9 +422,9 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]); #include "sc.h" #include "vt.h" #if NSC > 0 -# if NVT > 0 +# if NVT > 0 && !defined(LINT) # error "sc0 and vt0 are mutually exclusive" -# endif /* NVT > 0 */ +# endif d_open_t scopen; d_close_t scclose; d_rdwr_t scread, scwrite; |