diff options
| author |   Komuro <komurojun-mbn@nifty.com> | 2006-04-17 21:41:21 +0900 |
|---|---|---|
| committer |   Dominik Brodowski <linux@dominikbrodowski.net> | 2006-06-30 22:09:12 +0200 |
| commit | fd99ddd0701385344eadaf2daa6abbc5fb086750 (patch) | |
| tree | 013d75048f086edfa7a89ac3f3301dde13017817 /drivers/net/wireless | |
| parent | [PATCH] pcmcia: at91_cf suspend/resume/wakeup (diff) | |
| download | linux-dev-fd99ddd0701385344eadaf2daa6abbc5fb086750.tar.xz linux-dev-fd99ddd0701385344eadaf2daa6abbc5fb086750.zip | |
[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[] = { PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), - PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), +/* PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), conflict with pcnet_cs */ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), |