diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:43:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:43:28 -0400 |
| commit | c925f1ea9ec20a95d46f57810f4a4d69db74580e (patch) | |
| tree | 150d09324f1cf6b231bbe1f3791a75f9169470dd /drivers/net/wireless/hostap/hostap_cs.c | |
| parent | 8083e1656211eb1487329923d592ee061d08d7b3 (diff) | |
| parent | 884d3a2bad7293e56fe99d9322a1090bfdfd7c4e (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_cs.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 52e6df5c1a92..686d895116de 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
| @@ -847,6 +847,7 @@ static struct pcmcia_device_id hostap_cs_ids[] = { | |||
| 847 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), | 847 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), |
| 848 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), | 848 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), |
| 849 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), | 849 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), |
| 850 | PCMCIA_DEVICE_MANF_CARD(0x0126, 0x0002), | ||
| 850 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL", | 851 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL", |
| 851 | 0x74c5e40d), | 852 | 0x74c5e40d), |
| 852 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", | 853 | PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", |