Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / prism54 / islpci_dev.h

diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/prism54/islpci_dev.h
index 5049f37455b1606fd1240f55f08134900359d09a..736666da6c24344580c547ea708e3c24a65727f7 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -1,6 +1,5 @@
 /*
- *  
- *  Copyright (C) 2002 Intersil Americas Inc. 
+ *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
  *  Copyright (C) 2003 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
  *  Copyright (C) 2003 Aurelien Alleaume <slts@free.fr>
@@ -72,12 +71,12 @@ struct islpci_bss_wpa_ie {
        u8 bssid[ETH_ALEN];
        u8 wpa_ie[MAX_WPA_IE_LEN];
        size_t wpa_ie_len;
-       
+
 };
 
 typedef struct {
        spinlock_t slock;       /* generic spinlock; */
-       
+
        u32 priv_oid;
 
        /* our mib cache */
@@ -85,7 +84,7 @@ typedef struct {
         struct rw_semaphore mib_sem;
        void **mib;
        char nickname[IW_ESSID_MAX_SIZE+1];
-       
+
        /* Take care of the wireless stats */
        struct work_struct stats_work;
        struct semaphore stats_sem;
@@ -120,7 +119,7 @@ typedef struct {
        struct net_device *ndev;
 
        /* device queue interface members */
-       struct isl38xx_cb *control_block;       /* device control block 
+       struct isl38xx_cb *control_block;       /* device control block
                                                           (== driver_mem_address!) */
 
        /* Each queue has three indexes:
@@ -198,7 +197,7 @@ islpci_state_t islpci_set_state(islpci_private *priv, islpci_state_t new_state);
 
 #define ISLPCI_TX_TIMEOUT               (2*HZ)
 
-irqreturn_t islpci_interrupt(int, void *, struct pt_regs *);
+irqreturn_t islpci_interrupt(int, void *);
 
 int prism54_post_setup(islpci_private *, int);
 int islpci_reset(islpci_private *, int);
@@ -212,4 +211,8 @@ islpci_trigger(islpci_private *priv)
 
 int islpci_free_memory(islpci_private *);
 struct net_device *islpci_setup(struct pci_dev *);
+
+#define DRV_NAME       "prism54"
+#define DRV_VERSION    "1.2"
+
 #endif                         /* _ISLPCI_DEV_H */