summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-03-11 01:12:15 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-03-11 01:12:15 +0000
commit523a45f6cdfcadf4584b83ee55a48051a6459967 (patch)
tree8eeb61ba95b08645cf877869c0b9ecac6a17c190 /sys
parentf5f626c27476c1e71bf6c75626fc473b9673b312 (diff)
add art(4).
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/GENERIC4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index d4cc6e0bc97..e7e983f4db3 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.165 2006/02/14 18:11:00 miod Exp $
+# $OpenBSD: GENERIC,v 1.166 2006/03/11 01:12:14 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -219,6 +219,8 @@ skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
ral* at pci? # Ralink RT2500/RT2501/RT2600
ath* at pci? # Atheros AR5k (802.11)
+musycc* at pci? # Conexant HDLC controller
+art* at musycc? # Accoom Artery E1/T1 cards
#UNTESTED: the following section of drivers is untested on alpha.
en* at pci? # ENI PCI ATM (untested)
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 898c0bae9f6..c34f4207be3 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.116 2006/03/06 03:13:42 marco Exp $
+# $OpenBSD: GENERIC,v 1.117 2006/03/11 01:12:14 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -332,6 +332,8 @@ stge* at pci? # Sundance TC9021 GigE
hme* at pci? # Sun Happy Meal
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
+musycc* at pci? # Conexant HDLC controller
+art* at musycc? # Accoom Artery E1/T1 cards
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)