Pull bugzilla-7570 into release branch

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / wl3501_cs.c

diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 583e0d655a986897df28e5319ec238089681bb6c..ce9230b2f630e518870c4210a987ce61f4d2c03c 100644 (file)
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -26,7 +26,6 @@
  * Tested with Planet AP in 2.5.73-bk, 216 Kbytes/s in Infrastructure mode
  * with a SMP machine (dual pentium 100), using pktgen, 432 pps (pkt_size = 60)
  */
-#undef REALLY_SLOW_IO  /* most systems can safely undef this */
 
 #include <linux/delay.h>
 #include <linux/types.h>
@@ -1928,7 +1927,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
        p_dev->conf.Attributes  = CONF_ENABLE_IRQ;
        p_dev->conf.IntType     = INT_MEMORY_AND_IO;
        p_dev->conf.ConfigIndex = 1;
-       p_dev->conf.Present     = PRESENT_OPTION;
 
        dev = alloc_etherdev(sizeof(struct wl3501_card));
        if (!dev)