diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/net/wireless/ath/ath.h | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/net/wireless/ath/ath.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index e5ba6faf3281..86907e5ba6ca 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h | |||
| @@ -80,6 +80,7 @@ struct reg_dmn_pair_mapping { | |||
| 80 | 80 | ||
| 81 | struct ath_regulatory { | 81 | struct ath_regulatory { |
| 82 | char alpha2[2]; | 82 | char alpha2[2]; |
| 83 | enum nl80211_dfs_regions region; | ||
| 83 | u16 country_code; | 84 | u16 country_code; |
| 84 | u16 max_power_level; | 85 | u16 max_power_level; |
| 85 | u16 current_rd; | 86 | u16 current_rd; |