Module Name: src
Committed By: jmcneill
Date: Sat Jul 30 18:41:35 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
add PCKBD_CNATTACH_MAY_FAIL to be consistent with i386
To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/arch/amd64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.327 src/sys/arch/amd64/conf/GENERIC:1.328
--- src/sys/arch/amd64/conf/GENERIC:1.327 Sat Jul 23 21:12:57 2011
+++ src/sys/arch/amd64/conf/GENERIC Sat Jul 30 18:41:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.327 2011/07/23 21:12:57 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.328 2011/07/30 18:41:34 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.327 $"
+#ident "GENERIC-$Revision: 1.328 $"
maxusers 64 # estimated number of users
@@ -236,6 +236,8 @@
options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
options WSDISPLAY_COMPAT_USL # VT handling
options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+# don't attach pckbd as the console if no PS/2 keyboard is found
+options PCKBD_CNATTACH_MAY_FAIL
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
