Module Name: src
Committed By: thorpej
Date: Sat Jan 16 01:43:42 UTC 2021
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
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.580 -r1.581 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.580 src/sys/arch/amd64/conf/GENERIC:1.581
--- src/sys/arch/amd64/conf/GENERIC:1.580 Sun Sep 27 13:48:49 2020
+++ src/sys/arch/amd64/conf/GENERIC Sat Jan 16 01:43:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.580 2020/09/27 13:48:49 roy Exp $
+# $NetBSD: GENERIC,v 1.581 2021/01/16 01:43:42 thorpej 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.580 $"
+#ident "GENERIC-$Revision: 1.581 $"
maxusers 64 # estimated number of users
@@ -354,7 +354,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
