diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-23 14:43:45 -0400 |
| commit | 3b51cc996e81d8a113416d8094fa4a88f8360a51 (patch) | |
| tree | e75b98b228bb4e456c30673fcc4b56ffa1d09cf5 /include/net/cfg80211.h | |
| parent | c68ed255265968c3948fa2678bf59d15c471b055 (diff) | |
| parent | 672724403b42da1d276c6cf811e8e34d15efd964 (diff) | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 37cebd3aa0f7..5a4efe54cffd 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -1643,7 +1643,7 @@ struct ieee80211_radiotap_iterator { | |||
| 1643 | const struct ieee80211_radiotap_namespace *current_namespace; | 1643 | const struct ieee80211_radiotap_namespace *current_namespace; |
| 1644 | 1644 | ||
| 1645 | unsigned char *_arg, *_next_ns_data; | 1645 | unsigned char *_arg, *_next_ns_data; |
| 1646 | uint32_t *_next_bitmap; | 1646 | __le32 *_next_bitmap; |
| 1647 | 1647 | ||
| 1648 | unsigned char *this_arg; | 1648 | unsigned char *this_arg; |
| 1649 | int this_arg_index; | 1649 | int this_arg_index; |