summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-20 12:50:49 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-10-20 12:50:49 +0000
commitff92c7f205e416ad32e9e331b2ca5ad0165b9b1d (patch)
treebba18c5456a92876ab041ee90650fcb15dfbe3c5 /sys/arch/i386/conf/GENERIC
parent666be00caca11319514942c23a3c0f48db4bb768 (diff)
support for Intel 2100/2200BG/2915ABG wireless devices written by
damien.bergamini@free.fr. This gets imported even though there is no firmware in the tree. This is a ridiculous situation: everything is free, everything works, except Intel will not let us put a little dinky firmware flat file into OpenBSD. So OpenBSD is ready for Intel whenever they are. Are you a consumer? Do you want to see this changed -- contact jketreno@linux.intel.com and tell him how you feel about this. He is likely someone who cannot do anything about it, though. If anyone can work up or down the chain around his department and get me contact information for various people, I will compile and later publish such a list. Go do it people -- this is how things will change. Get me email addresses and phone numbers.
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-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 95f7cbdbb54..b665c8a8e39 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.380 2004/10/05 02:01:17 jsg Exp $
+# $OpenBSD: GENERIC,v 1.381 2004/10/20 12:50:48 deraadt Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -430,6 +430,8 @@ an* at isapnp? # Aironet IEEE 802.11DS
an* at pcmcia? # Aironet IEEE 802.11DS
#cnw* at pcmcia? # Xircom Netwave
ray* at pcmcia? # Raylink Aviator2.4/Pro 802.11FH
+ipw* at pci? # Intel PRO/Wireless 2100
+iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG/2915ABG
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs