Module Name: src
Committed By: martin
Date: Mon Jun 21 17:34:42 UTC 2021
Modified Files:
src/sys/arch/amd64/conf [netbsd-9]: GENERIC
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1308):
sys/arch/amd64/conf/GENERIC: revision 1.581
Enable tpm @ acpi (now that it can match TPM 1.2 devices, which are not,
as the comment implies, experimental).
To generate a diff of this commit:
cvs rdiff -u -r1.531.2.10 -r1.531.2.11 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.531.2.10 src/sys/arch/amd64/conf/GENERIC:1.531.2.11
--- src/sys/arch/amd64/conf/GENERIC:1.531.2.10 Tue Jul 7 10:29:05 2020
+++ src/sys/arch/amd64/conf/GENERIC Mon Jun 21 17:34:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.10 2020/07/07 10:29:05 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.11 2021/06/21 17:34:42 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.531.2.10 $"
+#ident "GENERIC-$Revision: 1.531.2.11 $"
maxusers 64 # estimated number of users
@@ -329,7 +329,7 @@ sony* at acpi? # Sony Notebook Control
spic* at acpi? # Sony Programmable I/O Controller
wsmouse* at spic? # mouse
thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
-#tpm* at acpi? # ACPI TPM (Experimental)
+tpm* at acpi? # ACPI TPM (Experimental)
ug* at acpi? # Abit uGuru Hardware monitor
valz* at acpi? # Toshiba Dynabook hotkeys
wb* at acpi? # Winbond W83L518D SD/MMC reader
