This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / wireless / wavelan.p.h

diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h
index 475add6..d35ac4d 100644 (file)
--- a/drivers/net/wireless/wavelan.p.h
+++ b/drivers/net/wireless/wavelan.p.h
@@ -377,8 +377,8 @@
 #include       <linux/in.h>
 #include       <linux/string.h>
 #include       <linux/delay.h>
-#include       <linux/bitops.h>
 #include       <asm/system.h>
+#include       <asm/bitops.h>
 #include       <asm/io.h>
 #include       <asm/dma.h>
 #include       <asm/uaccess.h>
@@ -510,7 +510,6 @@ struct net_local
   iw_stats     wstats;         /* Wireless-specific statistics */
 
   struct iw_spy_data   spy_data;
-  struct iw_public_data        wireless_data;
 #endif
 
 #ifdef HISTOGRAM
@@ -615,8 +614,6 @@ static inline void
 /* ------------------- IOCTL, STATS & RECONFIG ------------------- */
 static en_stats        *
        wavelan_get_stats(struct net_device *); /* Give stats /proc/net/dev */
-static iw_stats *
-       wavelan_get_wireless_stats(struct net_device *);
 static void
        wavelan_set_multicast_list(struct net_device *);
 /* ----------------------- PACKET RECEPTION ----------------------- */