diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-01-05 22:30:46 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-01-05 22:30:46 +0000 |
| commit | bc30f8b96f415f61eb8fc60add0e510e9416991c (patch) | |
| tree | 28c1a3bddfc5042ca3e5b156100993b2e3775541 /sys | |
| parent | 8cf43c41c99bf494c67a49955292c23d4a696b62 (diff) | |
enable nviic
ok deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index eb059fa3aed..ef3cdb24265 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.101 2006/01/04 00:40:08 dlg Exp $ +# $OpenBSD: GENERIC,v 1.102 2006/01/05 22:30:45 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -82,8 +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? +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 c7cc22dbf4e..5be507db526 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.459 2006/01/05 22:26:54 grange Exp $ +# $OpenBSD: GENERIC,v 1.460 2006/01/05 22:30:45 dlg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -108,8 +108,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? +nviic* at pci? # NVIDIA nForce2/3/4 SMBus controller +iic* at nviic? amdpm* at pci? # AMD-76x PM and SMBus controller iic* at amdpm? |