diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-29 07:19:47 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-29 07:19:47 +0300 |
| commit | e3c6d4ee545e427b55882d97d3b663c6411645fe (patch) | |
| tree | 294326663fb757739a98083c2ddd570d1eaf7337 /drivers/net/wireless/wl3501.h | |
| parent | 5bc053089376217943187ed5153d0d1e5c5085b6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| download | linux-e3c6d4ee545e427b55882d97d3b663c6411645fe.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sparc64/kernel/idprom.c
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 65ceb088f700..59bb3a55ab48 100644 --- 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)); /* |