4 files changed, 21 insertions, 9 deletions

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index df9d453dfd66..f3b4e74b7326 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/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.77.2.10 1997/06/06 12:24:17 jkh Exp $
+#	$Id: GENERIC,v 1.77.2.11 1997/07/16 04:45:14 jkh Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -95,7 +95,6 @@ device		scd0	at isa? port 0x230 bio
 device		sc0	at isa? port "IO_KBD" 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
-#options		PCVT_FREEBSD=210	# pcvt running on FreeBSD >= 2.0.5
 #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
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 18f0cac9b054..695d92e96e87 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.286.2.28 1997/10/05 21:00:25 joerg Exp $
+#	$Id: LINT,v 1.286.2.29 1997/10/17 08:28:55 kato 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
@@ -593,7 +593,6 @@ options		"MAXMEM=(128*1024)"
 
 # 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			# 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
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 4082b1e54c54..4c0910f30b1f 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.26.2.10 1997/09/15 04:56:50 rgrimes Exp $
+#	$Id: options.i386,v 1.26.2.11 1997/10/05 21:00:26 joerg Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -23,12 +23,8 @@ COM_MULTIPORT		opt_sio.h
 DSI_SOFT_MODEM		opt_sio.h
 I586_CTR_GUPROF		opt_i586_guprof.h
 I586_PMC_GUPROF		opt_i586_guprof.h
-FAT_CURSOR		opt_pcvt.h
-PCVT_FREEBSD		opt_pcvt.h
-PCVT_SCANSET		opt_pcvt.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h
-XSERVER			opt_pcvt.h
 
 AHC_TAGENABLE		opt_aic7xxx.h
 AHC_SCBPAGING_ENABLE	opt_aic7xxx.h
@@ -84,3 +80,18 @@ EISA_SLOTS		opt_eisa.h
 
 FDC_DEBUG			opt_fdc.h
 FDC_PRINT_BOGUS_CHIPTYPE	opt_fdc.h
+
+# pcvt(4) has a bunch of options
+FAT_CURSOR		opt_pcvt.h
+XSERVER			opt_pcvt.h
+PCVT_24LINESDEF		opt_pcvt.h
+PCVT_CTRL_ALT_DEL	opt_pcvt.h
+PCVT_EMU_MOUSE		opt_pcvt.h
+PCVT_FREEBSD		opt_pcvt.h
+PCVT_META_ESC		opt_pcvt.h
+PCVT_NSCREENS		opt_pcvt.h
+PCVT_PRETTYSCRNS	opt_pcvt.h
+PCVT_SCANSET		opt_pcvt.h
+PCVT_SCREENSAVER	opt_pcvt.h
+PCVT_USEKBDSEC		opt_pcvt.h
+PCVT_VT220KEYB		opt_pcvt.h
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h
index 357810949b1d..70c28919f438 100644
--- a/sys/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/i386/isa/pcvt/pcvt_hdr.h
@@ -67,6 +67,9 @@
 				/* see also: pcvt_ioctl.h	*/
 
 #include "opt_pcvt.h"
+#if defined(__FreeBSD__) && !defined(PCVT_FREEBSD)
+#  define PCVT_FREEBSD 210
+#endif
 
 #if PCVT_FREEBSD >= 200