diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /drivers/net/wireless/wl3501.h | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'drivers/net/wireless/wl3501.h')
| -rw-r--r-- | drivers/net/wireless/wl3501.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h index 8636d9306785..b5719437e981 100644 --- a/drivers/net/wireless/wl3501.h +++ b/drivers/net/wireless/wl3501.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define __WL3501_H__ | 2 | #define __WL3501_H__ |
| 3 | 3 | ||
| 4 | #include <linux/spinlock.h> | 4 | #include <linux/spinlock.h> |
| 5 | #include "ieee802_11.h" | 5 | #include <net/ieee80211.h> |
| 6 | 6 | ||
| 7 | /* define for WLA 2.0 */ | 7 | /* define for WLA 2.0 */ |
| 8 | #define WL3501_BLKSZ 256 | 8 | #define WL3501_BLKSZ 256 |
| @@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr { | |||
| 548 | 548 | ||
| 549 | struct wl3501_80211_tx_hdr { | 549 | struct wl3501_80211_tx_hdr { |
| 550 | struct wl3501_80211_tx_plcp_hdr pclp_hdr; | 550 | struct wl3501_80211_tx_plcp_hdr pclp_hdr; |
| 551 | struct ieee802_11_hdr mac_hdr; | 551 | struct ieee80211_hdr mac_hdr; |
| 552 | } __attribute__ ((packed)); | 552 | } __attribute__ ((packed)); |
| 553 | 553 | ||
| 554 | /* | 554 | /* |