summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjung <jung@openbsd.org>2015-09-30 12:24:44 +0000
committerjung <jung@openbsd.org>2015-09-30 12:24:44 +0000
commitf14693c00d2b3faf5a92e101475da614d3328d11 (patch)
tree41f390898054cc8b7c732e0eaa3879da327ce8c7
parentremove old self-kill() in the signal handler. must predate the (diff)
downloadwireguard-openbsd-f14693c00d2b3faf5a92e101475da614d3328d11.tar.xz
wireguard-openbsd-f14693c00d2b3faf5a92e101475da614d3328d11.zip
enable new asmc(4) driver on amd64
"go at it" deraadt@
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e05d37a9fad..2e15fe02140 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.397 2015/09/30 12:15:12 jung Exp $
+# $OpenBSD: GENERIC,v 1.398 2015/09/30 12:24:44 jung Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -105,7 +105,7 @@ lm* at wbsio?
uguru0 at isa? disable port 0xe0 # ABIT uGuru
aps0 at isa? port 0x1600 # ThinkPad Active Protection System
-#asmc0 at isa? port 0x300 # Apple SMC
+asmc0 at isa? port 0x300 # Apple SMC
piixpm* at pci? # Intel PIIX PM
iic* at piixpm?