Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amd64/conf add PCKBD_CNATTACH_MAY_FAIL to be consis...



details:   https://anonhg.NetBSD.org/src/rev/a13723e5266a
branches:  trunk
changeset: 767791:a13723e5266a
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jul 30 18:41:34 2011 +0000

description:
add PCKBD_CNATTACH_MAY_FAIL to be consistent with i386

diffstat:

 sys/arch/amd64/conf/GENERIC |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r d82bc653cfce -r a13723e5266a sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Jul 30 18:19:04 2011 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Jul 30 18:41:34 2011 +0000
@@ -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



Home | Main Index | Thread Index | Old Index