summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2013-03-30 08:56:54 +0000
committerkettenis <kettenis@openbsd.org>2013-03-30 08:56:54 +0000
commitd8d2cf45440fd5ab84b942efee2bc10fd4f7724c (patch)
treeea555ac328f9afa884a59897a753ffa511c75c10
parentprevious had one backslash too many; (diff)
downloadwireguard-openbsd-d8d2cf45440fd5ab84b942efee2bc10fd4f7724c.tar.xz
wireguard-openbsd-d8d2cf45440fd5ab84b942efee2bc10fd4f7724c.zip
Back out previous; this needs more thought.
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8a18a8b76ce..318e5e99e7f 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.339 2013/03/30 07:07:13 tedu Exp $
+# $OpenBSD: GENERIC,v 1.340 2013/03/30 08:56:54 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -315,7 +315,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
+#com2 at isa? port 0x3e8 irq 5
#com3 at isa? port 0x2e8 irq 9 # (conflicts with some video cards)
com* at pcmcia? # PCMCIA modems/serial ports