summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorJoerg Jung <jung@cvs.openbsd.org>2015-09-30 12:15:13 +0000
committerJoerg Jung <jung@cvs.openbsd.org>2015-09-30 12:15:13 +0000
commit7aa550cff08041ae0388e5c0c8b33e6862a03473 (patch)
tree26321debcba15e00ce4e63f3cb0445a00455fa59 /sys/arch/amd64/conf
parentf9a3c3fa433e8062e5aabfa57b2a7faf01e2e23d (diff)
add a (disabled) driver for the Apple System Management Controller (SMC) as
found in Apple Intel based devices "go at it" deraadt@
Diffstat (limited to 'sys/arch/amd64/conf')
-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 ea31984b4e0..e05d37a9fad 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.396 2015/09/10 16:30:23 krw Exp $
+# $OpenBSD: GENERIC,v 1.397 2015/09/30 12:15:12 jung Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -105,6 +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
piixpm* at pci? # Intel PIIX PM
iic* at piixpm?