1 --- a/drivers/net/wireless/ath/regd.c
2 +++ b/drivers/net/wireless/ath/regd.c
3 @@ -196,6 +196,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++) {
13 if (!wiphy->bands[band])
14 @@ -250,6 +254,10 @@ ath_reg_apply_active_scan_flags(struct w
15 struct ieee80211_channel *ch;
16 const struct ieee80211_reg_rule *reg_rule;
18 +#ifdef CPTCFG_ATH_USER_REGD
22 sband = wiphy->bands[IEEE80211_BAND_2GHZ];
25 @@ -299,6 +307,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 @@ -503,6 +515,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->flags |= WIPHY_FLAG_STRICT_REGULATORY;
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 @@ -123,6 +123,7 @@ RTL8187_LEDS=