aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap
diff options
context:
space:
mode:
authorVeli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>2011-11-24 21:35:28 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-11-28 14:44:00 -0500
commit090891fb2c68eecf95c18c8ba117fc850d21abf8 (patch)
tree117554f5b0ce4ef0aa90e448cb43dfede8fee9ac /drivers/net/wireless/hostap
parentmac80211: Make __check_htcap_disable static. (diff)
downloadlinux-dev-090891fb2c68eecf95c18c8ba117fc850d21abf8.tar.xz
linux-dev-090891fb2c68eecf95c18c8ba117fc850d21abf8.zip
hostap_cs: add ID for Canon K30225
Signed-off-by: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hostap')
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 5441ad195119..89e9d3a78c3c 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -656,6 +656,9 @@ static const struct pcmcia_device_id hostap_cs_ids[] = {
"Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
0xe6ec52ce, 0x08649af2, 0x4b74baa0),
PCMCIA_DEVICE_PROD_ID123(
+ "Canon", "Wireless LAN CF Card K30225", "Version 01.00",
+ 0x96ef6fe2, 0x263fcbab, 0xa57adb8c),
+ PCMCIA_DEVICE_PROD_ID123(
"D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
PCMCIA_DEVICE_PROD_ID123(