summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2007-09-06 16:37:04 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2007-09-06 16:37:04 +0000
commitc6e247e787ec447f45b62c9004cb5a3c238333e0 (patch)
tree351ec7fa21a2936aa63b4d0b36edfa7e2b4d286c /sys/arch
parent40d3bfb5b70d20f4daee163823d57c5e4c18df86 (diff)
new iwn(4) driver for Intel Wireless WiFi Link 4965AGN.
no support for 802.11n functions yet (need work in net80211(9) first). committed over my 4965AGN, with only 2 of 3 antennas plugged :-) needs a firmware that is not freely redistributable (see man page). ok deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/GENERIC3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 60eff4a96ca..169af3dd0ee 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.192 2007/09/04 20:19:24 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.193 2007/09/06 16:37:03 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -404,6 +404,7 @@ cnw* at pcmcia? # Xircom Netwave
ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
+iwn* at pci? # Intel Wireless WiFi Link 4965AGN
ral* at pci? # Ralink RT2500/RT2501/RT2600
ral* at cardbus? # Ralink RT2500/RT2501/RT2600
rtw* at pci? # Realtek 8180
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 52cc755f2f8..c2eb6e98de3 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.570 2007/09/04 20:19:24 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.571 2007/09/06 16:37:03 damien Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -556,6 +556,7 @@ ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
ipw* at pci? # Intel PRO/Wireless 2100
iwi* at pci? # Intel PRO/Wireless 2200BG/2915ABG
wpi* at pci? # Intel PRO/Wireless 3945ABG
+iwn* at pci? # Intel Wireless WiFi Link 4965AGN
ral* at pci? # Ralink RT2500/RT2501/RT2600
ral* at cardbus? # Ralink RT2500/RT2501/RT2600
rtw* at pci? # Realtek 8180