diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-25 12:46:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-25 12:46:37 -0700 |
| commit | 345578d97c549995ddbcc178f16f710602cc06bb (patch) | |
| tree | ce05e39a01ffce847f6f7f65f19b1e8e20dbf0c2 /drivers/net/wireless/ath/regd_common.h | |
| parent | fe2a70eefa18a3e419dd9a23e16af14258b7cc20 (diff) | |
| parent | cfef6047c4027a8448ec8dafeaf2bb362cc882e4 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/regd_common.h')
| -rw-r--r-- | drivers/net/wireless/ath/regd_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h index 5c2cfe69415..24b53839fc3 100644 --- a/drivers/net/wireless/ath/regd_common.h +++ b/drivers/net/wireless/ath/regd_common.h @@ -86,6 +86,7 @@ enum EnumRd { WOR9_WORLD = 0x69, WORA_WORLD = 0x6A, WORB_WORLD = 0x6B, + WORC_WORLD = 0x6C, MKK3_MKKB = 0x80, MKK3_MKKA2 = 0x81, @@ -282,6 +283,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = { {WOR9_WORLD, NO_CTL, NO_CTL}, {WORA_WORLD, NO_CTL, NO_CTL}, {WORB_WORLD, NO_CTL, NO_CTL}, + {WORC_WORLD, NO_CTL, NO_CTL}, }; static struct country_code_to_enum_rd allCountries[] = { |