summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/pcmciadevs6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index ae3433d6854..a8ed75f93c9 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.48 2004/06/01 17:35:58 millert Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.49 2004/06/04 18:03:35 millert Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
/*
@@ -252,6 +252,10 @@ static const struct wi_pcmcia_product {
{ PCMCIA_VENDOR_ADAPTEC2,
PCMCIA_PRODUCT_ADAPTEC2_AWN8030,
PCMCIA_CIS_ADAPTEC2_AWN8030
+ },
+ { PCMCIA_VENDOR_ASUS,
+ PCMCIA_PRODUCT_ASUS_WL_100,
+ PCMCIA_CIS_ASUS_WL_100
}
};
diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index 1d2e9fe8f6a..c803b29065d 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
- $OpenBSD: pcmciadevs,v 1.113 2004/06/04 16:02:34 millert Exp $
+ $OpenBSD: pcmciadevs,v 1.114 2004/06/04 18:03:35 millert Exp $
/* $NetBSD: pcmciadevs,v 1.13 1998/08/17 23:10:12 thorpej Exp $ */
/*
@@ -85,6 +85,7 @@ vendor SYMBOL 0x026c Symbol
vendor BUFFALO 0x026f BUFFALO (Melco Corporation)
vendor LINKSYS2 0x0274 The Linksys Group
vendor IODATA2 0x028a I-O DATA
+vendor ASUS 0x02aa ASUS
vendor MICROSOFT 0x02d2 Microsoft
vendor NWN 0x0602 No Wires Needed
vendor BREEZECOM 0x0a02 BreezeCOM
@@ -146,6 +147,9 @@ product ALLIEDTELESIS LA_PCM 0x0002 Allied Telesis LA-PCM
/* Archos */
product ARCHOS ARC_ATAPI 0x0043 MiniCD
+/* ASUS */
+product ASUS WL_100 0x0002 SpaceLink WL-100
+
/* Bay Networks */
product BAY STACK_650 0x0804 BayStack 650
product BAY SURFER_PRO 0x0806 AirSurfer Pro