summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-08-20 15:19:29 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-08-20 15:19:29 +0000
commit50be28188b0267eb4b19eb4ed737d31828803eb0 (patch)
tree87af6eef88626eb3633884f1cf36987218534dd1 /sys/arch/amd64/conf
parent7db4893ddd909b97eb2147ee39996739e04d34bc (diff)
Enable com@puc now that it works. OK deraadt@ miod@ henning@.
lpt@puc is still disabled until it gets tested.
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/amd64/conf/files.amd644
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 7fd6f0ebcbd..0006bb3e14d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.26 2004/08/01 21:34:34 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.27 2004/08/20 15:19:28 millert Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -150,7 +150,7 @@ ugen* at uhub? port ? configuration ? # USB Generic driver
#option SBP2_DEBUG
#option FWSCSI_DEBUG
-#puc* at pci? # PCI "universal" communication device
+puc* at pci? # PCI "universal" communication device
#isadma0 at isa?
@@ -191,7 +191,7 @@ com1 at isa? port 0x2f8 irq 3
#hsq0 at isa? port 0x140 irq 10 # Hostess 4-port serial card
#com* at hsq? slave ?
#com* at pcmcia? function ? # PCMCIA modems/serial ports
-#com* at puc? port ?
+com* at puc? port ?
# option for using CD1400 handshaking for incoming data
# requires a special cable that exchanges the RTS and DTR lines
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 9d3a3766705..1e77b8f1479 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.4 2004/07/20 20:17:16 art Exp $
+# $OpenBSD: files.amd64,v 1.5 2004/08/20 15:19:28 millert Exp $
maxpartitions 16
maxusers 2 16 128
@@ -90,6 +90,8 @@ include "dev/pci/files.pci"
file arch/amd64/pci/pci_machdep.c pci
file arch/amd64/pci/pciide_machdep.c pciide
+include "dev/puc/files.puc"
+
# PCI Host bridge chipsets
device pchb: pcibus
attach pchb at pci