Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6-omap-h63xx.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 451f6271dcbcfc35310ffc35cb35b1b6da605b74..4b9de0093a7b2314bf6439512b21f47fe8d6668a 100644 (file)
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -120,7 +120,7 @@
  * the Wavelan itself (NCR -> AT&T -> Lucent).
  *
  * All started with Anders Klemets <klemets@paul.rutgers.edu>,
- * writting a Wavelan ISA driver for the MACH microkernel. Girish
+ * writing a Wavelan ISA driver for the MACH microkernel. Girish
  * Welling <welling@paul.rutgers.edu> had also worked on it.
  * Keith Moore modify this for the Pcmcia hardware.
  * 
@@ -411,7 +411,6 @@
 /***************************** INCLUDES *****************************/
 
 /* Linux headers that we need */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -602,7 +601,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) */
-  dev_link_t * link;           /* pcmcia structure */
+  struct pcmcia_device *       link;           /* pcmcia structure */
   en_stats     stats;          /* Ethernet interface statistics */
   int          nresets;        /* Number of hw resets */
   u_char       configured;     /* If it is configured */
@@ -733,14 +732,13 @@ static int
 static inline void
        wv_hw_reset(struct net_device *);       /* Same, + start receiver unit */
 static inline int
-       wv_pcmcia_config(dev_link_t *); /* Configure the pcmcia interface */
+       wv_pcmcia_config(struct pcmcia_device *);       /* Configure the pcmcia interface */
 static void
-       wv_pcmcia_release(dev_link_t *);/* Remove a device */
+       wv_pcmcia_release(struct pcmcia_device *);/* Remove a device */
 /* ---------------------- INTERRUPT HANDLING ---------------------- */
 static irqreturn_t
        wavelan_interrupt(int,  /* Interrupt handler */
-                         void *,
-                         struct pt_regs *);
+                         void *);
 static void
        wavelan_watchdog(struct net_device *);  /* Transmission watchdog */
 /* ------------------- CONFIGURATION CALLBACKS ------------------- */