Merge branches 'release' and 'ppc-workaround' into release

[pandora-kernel.git] / drivers / net / wireless / wavelan.p.h

diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h
index 5cb0bc8..b33ac47 100644 (file)
--- a/drivers/net/wireless/wavelan.p.h
+++ b/drivers/net/wireless/wavelan.p.h
@@ -400,7 +400,6 @@
  */
 #undef SET_PSA_CRC             /* Calculate and set the CRC on PSA (slower) */
 #define USE_PSA_CONFIG         /* Use info from the PSA. */
-#undef STRUCT_CHECK            /* Verify padding of structures. */
 #undef EEPROM_IS_PROTECTED     /* doesn't seem to be necessary */
 #define MULTICAST_AVOID                /* Avoid extra multicast (I'm sceptical). */
 #undef SET_MAC_ADDRESS         /* Experimental */
@@ -449,9 +448,6 @@ static const char   *version        = "wavelan.c : v24 (SMP + wireless extensions) 11/12/
 /* Watchdog temporisation */
 #define        WATCHDOG_JIFFIES        (512*HZ/100)
 
-/* Macro to get the number of elements in an array */
-#define        NELS(a)                         (sizeof(a) / sizeof(a[0]))
-
 /* ------------------------ PRIVATE IOCTL ------------------------ */
 
 #define SIOCSIPQTHR    SIOCIWFIRSTPRIV         /* Set quality threshold */
@@ -642,8 +638,7 @@ static int
 /* ---------------------- 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 ------------------- */