5 files changed, 12 insertions, 2 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 0f982a0776db8..9e7ed3ece917d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.50 1995/11/05 17:02:50 gibbs Exp $
+#	$Id: GENERIC,v 1.51 1995/11/09 22:46:58 gibbs Exp $
 #
 
 machine		"i386"
@@ -82,6 +82,8 @@ device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
 #options		XSERVER			# include code for XFree86
+# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
+#options		"PCVT_SCANSET=2"	# IBM keyboards are non-std
 
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 28b74bcd036a8..1debd521441c7 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -419,6 +419,8 @@ 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
+# 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) - default.
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 0f982a0776db8..9e7ed3ece917d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-#	$Id: GENERIC,v 1.50 1995/11/05 17:02:50 gibbs Exp $
+#	$Id: GENERIC,v 1.51 1995/11/09 22:46:58 gibbs Exp $
 #
 
 machine		"i386"
@@ -82,6 +82,8 @@ device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
 #device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
 #options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
 #options		XSERVER			# include code for XFree86
+# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
+#options		"PCVT_SCANSET=2"	# IBM keyboards are non-std
 
 device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 28b74bcd036a8..1debd521441c7 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -419,6 +419,8 @@ 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
+# 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) - 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 28b74bcd036a8..1debd521441c7 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -419,6 +419,8 @@ 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
+# 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) - default.
 device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr