summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2004-11-02 02:45:38 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2004-11-02 02:45:38 +0000
commit811904472e873a7a84e99ef1b66849f83cbc0f3b (patch)
tree50d923cc6bbf781da3ce1af2c78315475c7664b0 /sys/arch/i386/conf
parent06d69193670ef9fccdcd8dde376ba739567cded6 (diff)
imported Sam Leffler's ath driver for atheros multimode wireless nics
from NetBSD and FreeBSD. ok deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
-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 e392ef61dbd..cca92e82002 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.382 2004/10/20 12:56:45 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.383 2004/11/02 02:45:36 reyk Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -420,6 +420,8 @@ hme* at pci? # Sun Happy Meal
bce* at pci? # Broadcom BCM4401
# Wireless network cards
+#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)
atw* at cardbus? # ADMtek ADM8211 (802.11)
wi* at pci? # WaveLAN IEEE 802.11DS