diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:58:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 14:58:41 -0500 |
| commit | 403e16731ffddc097eae89f53f9a7b0f0c9769c4 (patch) | |
| tree | 228d17985ad8ea22a7763457bf9641eb44781568 /net/wireless/reg.h | |
| parent | 55cb0797fa779e36f62876a8aa44cbf3984e8d59 (diff) | |
| parent | da29d2a5780d80857773d7776b7603a449b0b6e0 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c
Diffstat (limited to 'net/wireless/reg.h')
| -rw-r--r-- | net/wireless/reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.h b/net/wireless/reg.h index f023c8a31c60..4c0a32ffd530 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h | |||
| @@ -81,7 +81,7 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy, | |||
| 81 | */ | 81 | */ |
| 82 | void regulatory_hint_11d(struct wiphy *wiphy, | 82 | void regulatory_hint_11d(struct wiphy *wiphy, |
| 83 | enum ieee80211_band band, | 83 | enum ieee80211_band band, |
| 84 | u8 *country_ie, | 84 | const u8 *country_ie, |
| 85 | u8 country_ie_len); | 85 | u8 country_ie_len); |
| 86 | 86 | ||
| 87 | /** | 87 | /** |