Fixed spelling of new SC_KBD_PROBE_WORKS option in options.i386.

It worked because it is spelled correctly in LINT.

Added old obscure syscons options MAXCONS, SLOW_VGA and XT_KEYBOARD.
This file should be sorted both alphabetically and on the module
name by using a consistent prefix for each module, but there is no
consistency in the old options.  E.g., MAXCONS is spelled PCVT_NSCREENS
for pcvt.

5 files changed, 22 insertions, 7 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index a514b7b..343e4f3 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.275 1996/08/15 10:41:34 asami Exp $
+#	$Id: LINT,v 1.276 1996/09/06 23:35:45 pst 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
@@ -503,6 +503,9 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 options		SC_KBD_PROBE_WORKS	# keyboard probe should determine
 					# if syscons is available
+options		MAXCONS=16		# number of virtual consoles
+options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
+options		XT_KEYBOARD		# extra initialization for XT keyboard
 
 #
 # This device is mandatory.
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 2f7eb3e..7a839e6 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.14 1996/06/11 16:02:51 pst Exp $
+#	$Id: options.i386,v 1.15 1996/09/06 23:33:45 pst Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -28,7 +28,10 @@ CLK_CALIBRATION_LOOP	  opt_clock.h
 CLK_USE_I8254_CALIBRATION opt_clock.h
 CLK_USE_I586_CALIBRATION  opt_clock.h
 
-SC_KEYBOARD_PROBE_WORKS	opt_syscons.h
+SC_KBD_PROBE_WORKS	opt_syscons.h
+MAXCONS			opt_syscons.h
+SLOW_VGA		opt_syscons.h
+XT_KEYBOARD		opt_syscons.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index a514b7b..343e4f3 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.275 1996/08/15 10:41:34 asami Exp $
+#	$Id: LINT,v 1.276 1996/09/06 23:35:45 pst 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
@@ -503,6 +503,9 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 options		SC_KBD_PROBE_WORKS	# keyboard probe should determine
 					# if syscons is available
+options		MAXCONS=16		# number of virtual consoles
+options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
+options		XT_KEYBOARD		# extra initialization for XT keyboard
 
 #
 # This device is mandatory.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index a514b7b..343e4f3 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.275 1996/08/15 10:41:34 asami Exp $
+#	$Id: LINT,v 1.276 1996/09/06 23:35:45 pst 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
@@ -503,6 +503,9 @@ options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 options		SC_KBD_PROBE_WORKS	# keyboard probe should determine
 					# if syscons is available
+options		MAXCONS=16		# number of virtual consoles
+options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
+options		XT_KEYBOARD		# extra initialization for XT keyboard
 
 #
 # This device is mandatory.
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index 2f7eb3e..7a839e6 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.14 1996/06/11 16:02:51 pst Exp $
+#	$Id: options.i386,v 1.15 1996/09/06 23:33:45 pst Exp $
 BOUNCEPAGES		opt_bounce.h
 USER_LDT
 MATH_EMULATE		opt_math_emulate.h
@@ -28,7 +28,10 @@ CLK_CALIBRATION_LOOP	  opt_clock.h
 CLK_USE_I8254_CALIBRATION opt_clock.h
 CLK_USE_I586_CALIBRATION  opt_clock.h
 
-SC_KEYBOARD_PROBE_WORKS	opt_syscons.h
+SC_KBD_PROBE_WORKS	opt_syscons.h
+MAXCONS			opt_syscons.h
+SLOW_VGA		opt_syscons.h
+XT_KEYBOARD		opt_syscons.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h