diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-04-10 20:27:03 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2011-04-10 20:27:03 +0000 |
| commit | 38f0c80c668f47b0cfed2daebebb1386bba4e452 (patch) | |
| tree | 4abb3aff36277263607b834d9ae45b906cc28d60 /sys/arch/i386/conf | |
| parent | f0073f2271624cccfb3cfbedb96628f22fca97ba (diff) | |
Merge viapm and viaenv
Pluses:
- Add support SMBus for VT82C596, VT82C596B, VT82C686A, VT8231
- Add support ACPI timer for all VIA South Bridges
ok deraadt@, tested sthen@
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index e8def23c189..c4570d22250 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.712 2011/04/05 12:50:15 guenther Exp $ +# $OpenBSD: GENERIC,v 1.713 2011/04/10 20:27:02 shadchin Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -123,7 +123,7 @@ alipm* at pci? # Acer Labs M7101 power management iic* at alipm? ichiic* at pci? # Intel ICH SMBus controller iic* at ichiic? -viapm* at pci? # VIA VT8237 power management +viapm* at pci? # VIA SMBus controller iic* at viapm? amdiic* at pci? # AMD-8111 SMBus controller iic* at amdiic? @@ -141,7 +141,6 @@ schsio* at isa? port 0x4e schsio* at isa? port 0x162e schsio* at isa? port 0x164e -viaenv* at pci? # VIA VT82C686A hardware monitor viasio* at isa? port 0x2e flags 0x0000 # VIA VT1211 LPC Super I/O viasio* at isa? port 0x4e flags 0x0000 wbsio* at isa? port 0x2e # Winbond LPC Super I/O |