Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit fd99ddd0701385344eadaf2daa6abbc5fb086750

Authored by Komuro
Committed by Dominik Brodowski
1 parent 0db6095d4f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/net/wireless/hostap/hostap_cs.c
Diff comments   View file @ fd99ddd
... ... @@ -844,7 +844,7 @@
844 844 PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
845 845 PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
846 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 848 PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
849 849 PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
850 850 PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),