diff options
| author | Komuro <komurojun-mbn@nifty.com> | 2006-04-17 08:41:21 -0400 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-06-30 16:09:12 -0400 |
| commit | fd99ddd0701385344eadaf2daa6abbc5fb086750 (patch) | |
| tree | 013d75048f086edfa7a89ac3f3301dde13017817 /drivers/net/wireless | |
| parent | 0db6095d4ff8918350797dfe299d572980e82fa0 (diff) | |
[PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
Comment out the ID 0xc00f,0x0000 in hostap_cs.c, as it conflicts with the
pcnet_cs driver.
Signed-off-by: komurojun-mbn@nifty.com
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless')
| -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), |