summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-04-05 02:56:18 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-04-05 02:56:18 +0000
commitcd6ac16686f475536478bc39075228bd420a8cc5 (patch)
treec7cb74a104ec60fcecfd865970d9cd3b7dd6881b /sys/arch/i386/conf/GENERIC
parent3e18d2a00c298d50f8017e8c6c2819eec49569df (diff)
enable com3 on both i386 and amd64 (com4 config is added, but disabled)
ok miod kettenis tedu
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 861396e29d6..6dbf0465bcb 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.745 2013/03/27 20:23:52 miod Exp $
+# $OpenBSD: GENERIC,v 1.746 2013/04/05 02:56:15 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -391,7 +391,7 @@ pcppi0 at isa?
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
com2 at isa? port 0x3e8 irq 5
-#com3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards)
+com3 at isa? disable port 0x2e8 irq 9 # (conflicts with some video cards)
#com4 at isa? port 0x220 irq 4 # Fujitsu Stylistic Touchscreen
ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial card
#ast1 at isa? port 0x2a0 irq 6 # 2nd AST 4-port serial card