[src/netbsd-9]: src/sys/arch/amd64/conf Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b7d300d8e3d7
branches:  netbsd-9
changeset: 984102:b7d300d8e3d7
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 21 17:34:42 2021 +0000

description:
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).

diffstat:

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

diffs (27 lines):

diff -r 9969a2069245 -r b7d300d8e3d7 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Jun 21 17:32:52 2021 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Jun 21 17:34:42 2021 +0000
@@ -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 @@
 
 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 @@
 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