summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorJoshua Stein <jcs@cvs.openbsd.org>2016-08-03 17:23:39 +0000
committerJoshua Stein <jcs@cvs.openbsd.org>2016-08-03 17:23:39 +0000
commit18ba485de09e3ae1556cabbb5da54d682ad9415f (patch)
treee1a7d1f20174b8b47885951f0d1cf4692a36816a /sys/arch/amd64
parenta9bb4c96973f68b1b0f3dcbb4ab916d0cb1839d6 (diff)
add a minimal TPM 1.2 driver just to issue a "save state" command
before suspending, in order to fix suspend/resume on some newer machines. more cleanup and TPM 2.0 support coming later. earlier version ok pirofti ok deraadt
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index f6ccd404b81..2e35f01ee73 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.426 2016/07/30 16:25:04 jcs Exp $
+# $OpenBSD: GENERIC,v 1.427 2016/08/03 17:23:38 jcs Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -66,6 +66,7 @@ chvgpio* at acpi?
sdhc* at acpi?
#acpicbkbd* at acpi?
acpials* at acpi?
+tpm* at acpi?
mpbios0 at bios0