summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-08-22 13:52:30 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-08-22 13:52:30 +0000
commit6028e3abf6b3eb1aadac49c5eaf3f89db9aafa60 (patch)
treec994039fa08010477d6da9b4e172d49a460f9e86 /sys/arch
parent3cd6f7cf29a1da4dfa0e5d065f3dc9132c6261f3 (diff)
acx(4) seems to work fine on amd64 here also, so enable it.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ab10bc4bca5..cb37d50889d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.153 2006/08/18 23:14:43 jason Exp $
+# $OpenBSD: GENERIC,v 1.154 2006/08/22 13:52:29 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -360,6 +360,8 @@ art* at musycc? # Accoom Artery E1/T1 cards
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
# Wireless network cards
+acx* at pci? # TI ACX100/ACX111 (802.11b/g)
+acx* at cardbus? # TI ACX100/ACX111 (802.11b/g)
ath* at pci? # Atheros AR5k (802.11a/b/g)
ath* at cardbus? # Atheros AR5k (802.11a/b/g)
atw* at pci? # ADMtek ADM8211 (802.11)