[src/trunk]: src/sys/arch/amd64/conf Enable tpm @ acpi (now that it can match...

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

details:   https://anonhg.NetBSD.org/src/rev/57071943328d
branches:  trunk
changeset: 949753:57071943328d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 16 01:43:42 2021 +0000

description:
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 e322f00e7b34 -r 57071943328d sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Jan 16 01:23:04 2021 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Jan 16 01:43:42 2021 +0000
@@ -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 @@
 
 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 @@
 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