diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:08:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:08:07 -0400 |
commit | 51a730d758ae4052e10ca7e06336f10af598c4fc (patch) | |
tree | b76a004c00cd7139659be515ee03398e47067290 /drivers/net/wireless/atmel_cs.c | |
parent | 6cd15a9daf826115356f9403494c76e5aafa7793 (diff) | |
parent | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (diff) | |
download | blackbird-op-linux-51a730d758ae4052e10ca7e06336f10af598c4fc.tar.gz blackbird-op-linux-51a730d758ae4052e10ca7e06336f10af598c4fc.zip |
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
Diffstat (limited to 'drivers/net/wireless/atmel_cs.c')
-rw-r--r-- | drivers/net/wireless/atmel_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index a91b507e0a7a..a4ed28d9c783 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c @@ -321,6 +321,7 @@ static struct { { 0x01bf, 0x3302, NULL, ATMEL_FW_TYPE_502E, "Belkin F5D6020-V2" }, { 0, 0, "BT/Voyager 1020 Laptop Adapter", ATMEL_FW_TYPE_502, "BT Voyager 1020" }, { 0, 0, "IEEE 802.11b/Wireless LAN PC Card", ATMEL_FW_TYPE_502, "Siemens Gigaset PC Card II" }, + { 0, 0, "IEEE 802.11b/Wireless LAN Card S", ATMEL_FW_TYPE_504_2958, "Siemens Gigaset PC Card II" }, { 0, 0, "CNet/CNWLC 11Mbps Wireless PC Card V-5", ATMEL_FW_TYPE_502E, "CNet CNWLC-811ARL" }, { 0, 0, "Wireless/PC_CARD", ATMEL_FW_TYPE_502D, "Planet WL-3552" }, { 0, 0, "OEM/11Mbps Wireless LAN PC Card V-3", ATMEL_FW_TYPE_502, "OEM 11Mbps WLAN PCMCIA Card" }, |