1 --- a/drivers/net/wireless/ath/regd.c
2 +++ b/drivers/net/wireless/ath/regd.c
3 @@ -341,6 +341,10 @@ ath_reg_apply_beaconing_flags(struct wip
4 struct ieee80211_channel *ch;
7 +#ifdef CPTCFG_ATH_USER_REGD
11 for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
12 if (!wiphy->bands[band])
14 @@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
16 struct ieee80211_supported_band *sband;
18 +#ifdef CPTCFG_ATH_USER_REGD
22 sband = wiphy->bands[IEEE80211_BAND_2GHZ];
25 @@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
26 struct ieee80211_channel *ch;
29 +#ifdef CPTCFG_ATH_USER_REGD
33 if (!wiphy->bands[IEEE80211_BAND_5GHZ])
36 @@ -631,6 +643,10 @@ ath_regd_init_wiphy(struct ath_regulator
38 const struct ieee80211_regdomain *regd;
40 +#ifdef CPTCFG_ATH_USER_REGD
44 wiphy->reg_notifier = reg_notifier;
45 wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
46 REGULATORY_CUSTOM_REG;
47 --- a/drivers/net/wireless/ath/Kconfig
48 +++ b/drivers/net/wireless/ath/Kconfig
49 @@ -21,6 +21,9 @@ menuconfig ATH_CARDS
54 + bool "Do not enforce EEPROM regulatory restrictions"
57 bool "Atheros wireless debugging"
61 @@ -112,6 +112,7 @@ RTL8187_LEDS=
66 ATH_REG_DYNAMIC_USER_REG_HINTS=
67 ATH_REG_DYNAMIC_USER_CERT_TESTING=