Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / net / wireless / ipw2100.h

diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index 99fce99b701a9592dff2894fda65b460d2e2f8b5..140fdf2a0a09a58afdcbe36658a07476c16474c4 100644 (file)
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -37,7 +37,6 @@
 #include <linux/socket.h>
 #include <linux/if_arp.h>
 #include <linux/wireless.h>
-#include <linux/version.h>
 #include <net/iw_handler.h>    // new driver API
 
 #include <net/ieee80211.h>
@@ -524,8 +523,6 @@ struct ipw2100_priv {
 
        int power_mode;
 
-       /* WEP data */
-       struct ieee80211_security sec;
        int messages_sent;
 
        int short_retry_limit;