summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-03-28 17:04:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-03-28 17:04:30 +0000
commita90bf08cd5f48a86c4a400323bb0a2050b77cc84 (patch)
treeb3b0c4d5af827c3eeb7dd53488692656d924e0f0 /sys/arch
parentd57db2c5600004f5e28a025da6cf324c304510fc (diff)
Driver for microguru sensor microcontroller found on ABIT motherboards.
Driver written by Mikko Tolmunen <oskari@sefirosu.org>
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index b6e5132167f..2e3b926bef8 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.287 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.288 2010/03/28 17:04:27 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -95,6 +95,7 @@ viaenv* at pci? # VIA VT82C686A hardware monitor
wbsio* at isa? port 0x2e # Winbond LPC Super I/O
wbsio* at isa? port 0x4e
+uguru0 at isa? port 0xe0 # ABIT uGuru
lm* at wbsio?
aps0 at isa? port 0x1600 # ThinkPad Active Protection System
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0d4092c0168..7fb56a01a7b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.681 2010/03/27 16:02:19 jakemsr Exp $
+# $OpenBSD: GENERIC,v 1.682 2010/03/28 17:04:26 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -148,6 +148,7 @@ viasio* at isa? port 0x4e flags 0x0000
wbsio* at isa? port 0x2e # Winbond LPC Super I/O
wbsio* at isa? port 0x4e
lm* at wbsio?
+uguru0 at isa? port 0xe0 # ABIT uGuru
fins0 at isa? port 0x4e # Fintek F71805 Super I/O
aps0 at isa? port 0x1600 # ThinkPad Active Protection System