summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC10
-rw-r--r--sys/arch/macppc/conf/GENERIC5
2 files changed, 13 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index eef35bc2815..1c2fc6d93ac 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.56 2005/03/05 23:58:43 tdeval Exp $
+# $OpenBSD: GENERIC,v 1.57 2005/03/16 18:56:48 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -280,6 +280,10 @@ stge* at pci? # Sundance TC9021 GigE
vge* at pci? # VIA VT612x
# 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
#wi* at pcmcia? # WaveLAN IEEE 802.11DS
#awi* at pcmcia? # Bay Networks IEEE 802.11FH
@@ -287,6 +291,10 @@ wi* at pci? # WaveLAN IEEE 802.11DS
#an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
#ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
+ral* at pci? # Ralink RT2500
+#ral* at cardbus? # Ralink RT2500
+rtw* at pci? # Realtek 8180
+#rtw* at cardbus? # Realtek 8180
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 9f405d019f8..16689732d9c 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.73 2005/03/15 21:12:28 drahn Exp $g
+# $OpenBSD: GENERIC,v 1.74 2005/03/16 18:56:47 deraadt Exp $g
#
# PPC GENERIC config file
#
@@ -66,7 +66,10 @@ em* at pci? # Intel Pro/1000 ethernet
ti* at pci? # Alteon Tigon 1Gb ethernet
re* at pci? # Realtek 8169/8169S/8110S
an* at pci? # Cisco/Aironet
+atw* at pci? # ADMtek ADM8211 (802.11)
wi* at pci? # WaveLAN IEEE 802.11DS
+ral* at pci? # Ralink RT2500
+#rtw* at pci? # Realtek 8180
iop* at pci? # I2O processor
ioprbs* at iop? # I2O arrays
iopsp* at iop? # I2O SCSI pass-through