diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-04-05 02:56:15 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-04-05 02:56:15 +0000 |
| commit | b8bd18582c96cf6d7844ca0472daf65723f42481 (patch) | |
| tree | cbdf02b6b889b3a37aec79e512b6ed5e26d17b4c | |
| parent | move the bounds check for execbuffer relocation count closer to linux (diff) | |
| download | wireguard-openbsd-b8bd18582c96cf6d7844ca0472daf65723f42481.tar.xz wireguard-openbsd-b8bd18582c96cf6d7844ca0472daf65723f42481.zip | |
enable com3 on both i386 and amd64 (com4 config is added, but disabled)
ok miod kettenis tedu
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 318e5e99e7f..03bd0bcd66f 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.340 2013/03/30 08:56:54 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.341 2013/04/05 02:56:17 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -315,8 +315,8 @@ 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) +com2 at isa? port 0x3e8 irq 5 +com3 at isa? disable port 0x2e8 irq 9 # (conflicts with some video cards) com* at pcmcia? # PCMCIA modems/serial ports com* at puc? 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 |