diff options
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_cs.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index db03dc2646df..fbb41893ee81 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
@@ -844,7 +844,7 @@ static struct pcmcia_device_id hostap_cs_ids[] = { | |||
844 | PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), | 844 | PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), |
845 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), | 845 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), |
846 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), | 846 | PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), |
847 | PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), | 847 | /* PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), conflict with pcnet_cs */ |
848 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), | 848 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), |
849 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), | 849 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), |
850 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), | 850 | PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), |