diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-11-19 21:38:48 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-11-19 21:38:48 +0100 |
commit | ab1f5a532c9d33b49b039660c5ecbc0ab53e7133 (patch) | |
tree | a1c1d820f2280535978632c5935462efcf5a4c7f /drivers/net/wireless/ath/ath.h | |
parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | ath9k: Fix RTC_DERIVED_CLK usage (diff) | |
download | linux-ab1f5a532c9d33b49b039660c5ecbc0ab53e7133.tar.xz linux-ab1f5a532c9d33b49b039660c5ecbc0ab53e7133.zip |
Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 76668dc79c0e..ccba4fea7269 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -80,6 +80,7 @@ struct reg_dmn_pair_mapping { struct ath_regulatory { char alpha2[2]; + enum nl80211_dfs_regions region; u16 country_code; u16 max_power_level; u16 current_rd; |