summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 575b290e6a4..eb059fa3aed 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.100 2005/12/31 18:45:23 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.101 2006/01/04 00:40:08 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -82,6 +82,8 @@ viapm* at pci? # VIA VT8237 power management
iic* at viapm?
amdiic* at pci? # AMD-8111 SMBus controller
iic* at amdiic?
+#nviic* at pci? # NVIDIA nForce2/3/4 SMBus controller
+#iic* at nviic?
adc* at iic? # Analog Devices AD7416/AD7417/7418
admtemp* at iic? # Analog Devices ADM1021
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 5d259117269..bfce90d47e5 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.455 2005/12/31 18:47:20 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.456 2006/01/04 00:40:08 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -109,6 +109,8 @@ viapm* at pci? # VIA VT8237 power management
iic* at viapm?
amdiic* at pci? # AMD-8111 SMBus controller
iic* at amdiic?
+#nviic* at pci? # NVIDIA nForce2/3/4 SMBus controller
+#iic* at nviic?
it0 at isa? port 0x290 # IT8705F, IT8712F and SiS970 hardware
it1 at isa? port 0xc00 # monitors