diff options
| author | imp <imp@FreeBSD.org> | 2001-11-19 05:11:35 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2001-11-19 05:11:35 +0000 |
| commit | 15c4a90ac4378287d335c4d5f77d33b2d3efb086 (patch) | |
| tree | 61b8a2dd3474ff2a4118e775d9f8c5b6a80c1dc8 /sys/dev/pccard/pccarddevs | |
| parent | dc8e2b758472a554aa634cfa6158dc806e290d4a (diff) | |
| download | FreeBSD-src-15c4a90ac4378287d335c4d5f77d33b2d3efb086.zip FreeBSD-src-15c4a90ac4378287d335c4d5f77d33b2d3efb086.tar.gz | |
Merge NetBSD 1.146: Linksys Instant Wireless Network card.
Obtained From: NetBSD
Diffstat (limited to 'sys/dev/pccard/pccarddevs')
| -rw-r--r-- | sys/dev/pccard/pccarddevs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pccard/pccarddevs b/sys/dev/pccard/pccarddevs index 2baa87b..d844563 100644 --- a/sys/dev/pccard/pccarddevs +++ b/sys/dev/pccard/pccarddevs @@ -1,5 +1,5 @@ $FreeBSD$ -/* $NetBSD: pcmciadevs,v 1.145 2001/11/08 17:05:42 christos Exp $ */ +/* $NetBSD: pcmciadevs,v 1.146 2001/11/18 04:25:43 mrg Exp $ */ /* $OpenBSD: pcmciadevs,v 1.71 2001/10/28 19:21:37 mickey Exp $ */ /*- @@ -101,6 +101,7 @@ vendor ALLIEDTELESIS 0xc00f Allied Telesis K.K. vendor HAGIWARASYSCOM 0xc012 Hagiwara SYS-COM vendor RATOC 0xc015 RATOC System Inc. vendor EMTAC 0xc250 EMTAC Technology Corporation +vector LINKSYS2 0x0274 The Linksys Group vendor ELSA 0xd601 Elsa /* @@ -220,6 +221,7 @@ product LINKSYS TRUST_COMBO_ECARD 0x021b Trust (Linksys) Combo EthernetCard product LINKSYS ETHERFAST 0x0230 Linksys Etherfast 10/100 Ethernet product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650 product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard +product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card /* Lucent WaveLAN/IEEE */ product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE @@ -432,5 +434,4 @@ product SYNERGY21 S21810 { "PCMCIA", "Ethernet", "A", "004743118001" } Synergy 2 product TEAC IDECARDII { NULL, "NinjaATA-", NULL, NULL } TEAC IDE Card/II product XIRCOM CFE_10 { "Xircom", "CompactCard&spEthernet", "CFE-10", "1.00" } Xircom CompactCard CFE-10 product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD - product ZOOM AIR_4000 { "Zoom", "Air-4000", NULL, NULL } Zoom Air-4000 |
