--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -196,6 +196,10 @@ ath_reg_apply_beaconing_flags(struct wip
 	struct ieee80211_channel *ch;
 	unsigned int i;
 
+#ifdef CPTCFG_ATH_USER_REGD
+	return;
+#endif
+
 	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
 
 		if (!wiphy->bands[band])
@@ -250,6 +254,10 @@ ath_reg_apply_active_scan_flags(struct w
 	struct ieee80211_channel *ch;
 	const struct ieee80211_reg_rule *reg_rule;
 
+#ifdef CPTCFG_ATH_USER_REGD
+	return;
+#endif
+
 	sband = wiphy->bands[IEEE80211_BAND_2GHZ];
 	if (!sband)
 		return;
@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
 	struct ieee80211_channel *ch;
 	unsigned int i;
 
+#ifdef CPTCFG_ATH_USER_REGD
+	return;
+#endif
+
 	if (!wiphy->bands[IEEE80211_BAND_5GHZ])
 		return;
 
@@ -503,6 +515,10 @@ ath_regd_init_wiphy(struct ath_regulator
 {
 	const struct ieee80211_regdomain *regd;
 
+#ifdef CPTCFG_ATH_USER_REGD
+	return 0;
+#endif
+
 	wiphy->reg_notifier = reg_notifier;
 	wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
 
--- a/drivers/net/wireless/ath/Kconfig
+++ b/drivers/net/wireless/ath/Kconfig
@@ -21,6 +21,9 @@ menuconfig ATH_CARDS
 
 if ATH_CARDS
 
+config ATH_USER_REGD
+	bool "Do not enforce EEPROM regulatory restrictions"
+
 config ATH_DEBUG
 	bool "Atheros wireless debugging"
 	---help---
--- a/.local-symbols
+++ b/.local-symbols
@@ -123,6 +123,7 @@ RTL8187_LEDS=
 ATH_COMMON=
 ATH_CARDS=
 ATH_DEBUG=
+ATH_USER_REGD=
 ATH5K=
 ATH5K_DEBUG=
 ATH5K_TRACER=