summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-08-04 10:50:24 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-08-04 10:50:24 +0000
commit85a4b7c8f8d9cd75eb3f135175fb4444aacca6d4 (patch)
tree5c6817733df71c838951c0f62ffb035954a93580 /sys/arch/i386
parent7df59aefa55cbd908911f7fc49c89c32af1e808e (diff)
acx can already be enabled (as developer pressure hah)
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b306afd3cd7..6aac5904a06 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.515 2006/08/03 18:19:04 marco Exp $
+# $OpenBSD: GENERIC,v 1.516 2006/08/04 10:50:23 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -497,6 +497,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)