Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[karo-tx-linux.git] / drivers / net / wireless / ath / regd_common.h

diff --git a/drivers/net/wireless/ath/regd_common.h b/drivers/net/wireless/ath/regd_common.h
index 248c670fdfbefe0bf06e3ace4e33b2e4bd43da05..24b53839fc3ae43176743739c510f2902f0c4aa2 100644 (file)
--- 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,
@@ -195,6 +196,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = {
        {APL9_WORLD, CTL_ETSI, CTL_ETSI},
 
        {APL3_FCCA, CTL_FCC, CTL_FCC},
+       {APL7_FCCA, CTL_FCC, CTL_FCC},
        {APL1_ETSIC, CTL_FCC, CTL_ETSI},
        {APL2_ETSIC, CTL_FCC, CTL_ETSI},
        {APL2_APLD, CTL_FCC, NO_CTL},
@@ -281,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[] = {