linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / wireless / wavelan_cs.p.h

diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index f34a36b..f2d5975 100644 (file)
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -99,7 +99,11 @@
  * caracteristics of the hardware in a standard way and support for
  * applications for taking advantage of it (like Mobile IP).
  *
- * It might be a good idea as well to fetch the wireless tools to
+ * You will need to enable the CONFIG_NET_RADIO define in the kernel
+ * configuration to enable the wireless extensions (this is the one
+ * giving access to the radio network device choice).
+ *
+ * It might also be a good idea as well to fetch the wireless tools to
  * configure the device and play a bit.
  */
 
@@ -411,6 +415,7 @@
 /***************************** INCLUDES *****************************/
 
 /* Linux headers that we need */
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -435,8 +440,11 @@
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
 #include <linux/ethtool.h>
+
+#ifdef CONFIG_NET_RADIO
 #include <linux/wireless.h>            /* Wireless extensions */
 #include <net/iw_handler.h>            /* New driver API */
+#endif
 
 /* Pcmcia headers that we need */
 #include <pcmcia/cs_types.h>
@@ -601,7 +609,7 @@ struct net_local
   dev_node_t   node;           /* ???? What is this stuff ???? */
   struct net_device *  dev;            /* Reverse link... */
   spinlock_t   spinlock;       /* Serialize access to the hardware (SMP) */
-  struct pcmcia_device *       link;           /* pcmcia structure */
+  dev_link_t * link;           /* pcmcia structure */
   en_stats     stats;          /* Ethernet interface statistics */
   int          nresets;        /* Number of hw resets */
   u_char       configured;     /* If it is configured */
@@ -732,9 +740,9 @@ static int
 static inline void
        wv_hw_reset(struct net_device *);       /* Same, + start receiver unit */
 static inline int
-       wv_pcmcia_config(struct pcmcia_device *);       /* Configure the pcmcia interface */
+       wv_pcmcia_config(dev_link_t *); /* Configure the pcmcia interface */
 static void
-       wv_pcmcia_release(struct pcmcia_device *);/* Remove a device */
+       wv_pcmcia_release(dev_link_t *);/* Remove a device */
 /* ---------------------- INTERRUPT HANDLING ---------------------- */
 static irqreturn_t
        wavelan_interrupt(int,  /* Interrupt handler */