Pull hotplug into release branch

[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 f34a36b0c7b0e0ec2424d7c909b88c89ec695f0e..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.
  * 
@@ -738,8 +738,7 @@ static void
 /* ---------------------- 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 ------------------- */