summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2007-10-11 17:28:32 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2007-10-11 17:28:32 +0000
commit681abe59d96713b4a9b0aeb331bdd87d621f0d3b (patch)
tree5eda600c0fc7aeb03a278463d973aa19ba4be0ba /sys/arch
parent1a833e40ceadeee62c9f892059c3f7bf0226a2fa (diff)
enable puc(4) for GENERIC on armish
ok deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/armish/conf/GENERIC6
-rw-r--r--sys/arch/armish/conf/files.armish3
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 9973324f130..010a5e3f06d 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.18 2007/10/08 12:56:37 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.19 2007/10/11 17:28:31 sthen Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -37,6 +37,10 @@ obio0 at mainbus?
# On-board 16550 UART
com0 at obio? addr 0xfe800000 xint 3
+puc* at pci? # PCI "universal" communication device
+com* at puc?
+lpt* at puc?
+
# i80321 I/O Processor peripheral support
iopxs0 at mainbus?
#gpio* at iopxs0
diff --git a/sys/arch/armish/conf/files.armish b/sys/arch/armish/conf/files.armish
index 839ccae071b..88bdef1ea45 100644
--- a/sys/arch/armish/conf/files.armish
+++ b/sys/arch/armish/conf/files.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: files.armish,v 1.11 2007/06/08 22:57:42 jasper Exp $
+# $OpenBSD: files.armish,v 1.12 2007/10/11 17:28:31 sthen Exp $
maxpartitions 16
maxusers 2 8 64
@@ -68,6 +68,7 @@ include "dev/mii/files.mii"
include "../../../dev/pci/files.pci"
file arch/armish/dev/pciide_machdep.c pciide
+include "../../../dev/puc/files.puc"
include "../../../dev/atapiscsi/files.atapiscsi"