Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.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 628fb91..0705316 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_dev.h
+++ b/drivers/net/wireless/prism54/islpci_dev.h
@@ -23,7 +23,6 @@
 #ifndef _ISLPCI_DEV_H
 #define _ISLPCI_DEV_H
 
-#include <linux/version.h>
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
@@ -100,13 +99,14 @@ typedef struct {
 
        struct iw_spy_data spy_data; /* iwspy support */
 
+       struct iw_public_data wireless_data;
+
        int monitor_type; /* ARPHRD_IEEE80211 or ARPHRD_IEEE80211_PRISM */
 
        struct islpci_acl acl;
 
        /* PCI bus allocation & configuration members */
        struct pci_dev *pdev;   /* PCI structure information */
-       u32 pci_state[16];      /* used for suspend/resume */
        char firmware[33];
 
        void __iomem *device_base;      /* ioremapped device base address */
@@ -208,8 +208,6 @@ islpci_trigger(islpci_private *priv)
                               priv->device_base);
 }
 
-struct net_device_stats *islpci_statistics(struct net_device *);
-
 int islpci_free_memory(islpci_private *);
 struct net_device *islpci_setup(struct pci_dev *);
 #endif                         /* _ISLPCI_DEV_H */