Merge branch 'origin' into devel

[karo-tx-linux.git] / drivers / net / wireless / wl3501.h

diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 65ceb088f7000c9e06b371605857302d59beeeff..8bce1a550a2296218131dfce28128224f14e678d 100644 (file)
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -2,7 +2,7 @@
 #define __WL3501_H__
 
 #include <linux/spinlock.h>
-#include <net/ieee80211.h>
+#include <linux/ieee80211.h>
 
 /* define for WLA 2.0 */
 #define WL3501_BLKSZ 256
@@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr {
 
 struct wl3501_80211_tx_hdr {
        struct wl3501_80211_tx_plcp_hdr pclp_hdr;
-       struct ieee80211_hdr_4addr              mac_hdr;
+       struct ieee80211_hdr            mac_hdr;
 } __attribute__ ((packed));
 
 /*
@@ -606,7 +606,7 @@ struct wl3501_card {
        u8                              reg_domain;
        u8                              version[2];
        struct wl3501_scan_confirm      bss_set[20];
-       struct net_device_stats         stats;
+
        struct iw_statistics            wstats;
        struct iw_spy_data              spy_data;
        struct iw_public_data           wireless_data;