Module Name: src
Committed By: mbalmer
Date: Sat Aug 15 08:44:35 UTC 2009
Modified Files:
src/sys/arch/i386/conf: GENERIC
Log Message:
Add commented entries for keylock support.
To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/sys/arch/i386/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/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.940 src/sys/arch/i386/conf/GENERIC:1.941
--- src/sys/arch/i386/conf/GENERIC:1.940 Wed Jul 29 11:58:31 2009
+++ src/sys/arch/i386/conf/GENERIC Sat Aug 15 08:44:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.940 2009/07/29 11:58:31 mbalmer Exp $
+# $NetBSD: GENERIC,v 1.941 2009/08/15 08:44:35 mbalmer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.940 $"
+#ident "GENERIC-$Revision: 1.941 $"
maxusers 64 # estimated number of users
@@ -304,6 +304,10 @@
#options SPLASHSCREEN
#options SPLASHSCREEN_PROGRESS
+# Keylock support
+#options KEYLOCK
+#options secmodel_keylock # Requires options KEYLOCK
+
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
#config netbsd root on sd0a type ffs
@@ -682,6 +686,9 @@
# 1-Wire devices
#owtemp* at onewire? # Temperature sensors
+# Keylock support
+#gpiolock* at gpio?
+
# SCSI Controllers and Devices
# PCI SCSI controllers
