summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/loongson/conf/GENERIC4
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 0716bf92f79..8e8e70e0f6f 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.315 2011/04/03 12:32:05 claudio Exp $
+# $OpenBSD: GENERIC,v 1.316 2011/04/10 20:27:02 shadchin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -90,7 +90,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
@@ -105,7 +104,7 @@ piixpm* at pci? # Intel PIIX PM
iic* at piixpm?
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?
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
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 5cd8754f2a8..31a146ece1c 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.32 2011/02/17 20:14:30 miod Exp $
+# $OpenBSD: GENERIC,v 1.33 2011/04/10 20:27:02 shadchin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -79,7 +79,7 @@ vga* at pci?
wsdisplay* at vga?
auvia* at pci?
audio* at auvia?
-viaenv* at pci?
+viapm* at pci?
# USB Controllers
ohci* at pci?