summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2010-07-03 01:02:26 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2010-07-03 01:02:26 +0000
commit068b9a96a35ba933a788d371e9a3c8e282c10f5a (patch)
treebe5733d15eec9444d218e5a8e65a91f3ad946497 /sys/arch
parentc7fb6fb68e43859610679081e1851b4cb1a25e2a (diff)
Intel 3400 Thermal Sensor driver, found on some new Intel machines.
This is also the same as the Intel Series 5 Thermal Sensor. ok deraadt@, kettenis@
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 f9853c899f8..c6b26ccd4bc 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.290 2010/06/27 21:00:22 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.291 2010/07/03 01:02:25 mlarkin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -113,6 +113,7 @@ iic* at nviic?
amdpm* at pci? # AMD-7xx/8111 and NForce SMBus controller
iic* at amdpm?
+itherm* at pci? # Intel 3400 Thermal Sensor
adc* at iic? # Analog Devices AD7416/AD7417/7418
adl* at iic? # Andigilog aSC7621
admtemp* at iic? # Analog Devices ADM1021
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7babe24783f..a280478ecfb 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.685 2010/07/01 17:30:25 tedu Exp $
+# $OpenBSD: GENERIC,v 1.686 2010/07/03 01:02:25 mlarkin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -152,6 +152,7 @@ fins0 at isa? port 0x4e # Fintek F71805 Super I/O
aps0 at isa? port 0x1600 # ThinkPad Active Protection System
+itherm* at pci? # Intel 3400 Thermal Sensor
adc* at iic? # Analog Devices AD7416/AD7417/7418
andl* at iic? # Andigilog aSC7611
adl* at iic? # Andigilog aSC7621