summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-09-27 03:49:15 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-09-27 03:49:15 +0000
commit81778ee81ac52d4b19244f51441fee481d8379f6 (patch)
tree9b367ccc4774b78bb605ff7b0f71804d1fc24660 /sys
parent71a7c7a10b87b82edf77a38a3ed8c5ac20a91dff (diff)
Add Proxim Harmony 802.11b card and attach it to wi(4); David Vincelli
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/pcmciadevs3
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 50da38b41c5..91b02703043 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.50 2004/09/25 02:01:31 fgsch Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.51 2004/09/27 03:49:14 millert Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
/*
@@ -245,6 +245,10 @@ static const struct wi_pcmcia_product {
PCMCIA_PRODUCT_SIEMENS_SS1021,
PCMCIA_CIS_SIEMENS_SS1021
},
+ { PCMCIA_VENDOR_PROXIM,
+ PCMCIA_PRODUCT_PROXIM_HARMONY_80211B,
+ PCMCIA_CIS_PROXIM_HARMONY_80211B
+ },
{ PCMCIA_VENDOR_MICROSOFT,
PCMCIA_PRODUCT_MICROSOFT_MN520,
PCMCIA_CIS_MICROSOFT_MN520
diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index aeb9ce9ec51..1f836b97a30 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
- $OpenBSD: pcmciadevs,v 1.115 2004/09/25 01:57:08 fgsch Exp $
+ $OpenBSD: pcmciadevs,v 1.116 2004/09/27 03:49:14 millert Exp $
/* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
/*
@@ -304,6 +304,7 @@ product PANASONIC KME 0x2604 Panasonic CD-R/RW Interface
product PROXIM ROAMABOUT_2400FH 0x1058 Digital RoamAbout 2400FH
product PROXIM RANGELAN2_7401 0x1158 Proxim RangeLAN2 7401
product PROXIM RANGELANDS_8430 0x8000 Proxim RangeLAN-DS 8430
+product PROXIM HARMONY_80211B 0x0002 Proxim Harmony 802.11B
/* Ericsson */
product ERICSSON WIRELESSLAN 0x0001 DSSS Wireless LAN PC Card