From 57338e5ad4a6a373a04cd298f02734676a13f6ab Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 3 Dec 2012 19:12:02 +0100
Subject: [PATCH] --- yaml --- r: 351737 b: refs/heads/master c:
 0ba857ad671aa8aa2a1276aa7a0c79abd0575146 h: refs/heads/master i:   351735:
 f497ab7819d4c5f9061d7ed28186be68f311a0ba v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/reg.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index be62f83ca15b..4730e90a132f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4f2c8819a51f31ef0f929574ce8d80b323c6a76
+refs/heads/master: 0ba857ad671aa8aa2a1276aa7a0c79abd0575146
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 946cd5320ef9..b63bdf899a75 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2322,10 +2322,6 @@ int __init regulatory_init(void)
 		 * errors as non-fatal.
 		 */
 		pr_err("kobject_uevent_env() was unable to call CRDA during init\n");
-#ifdef CONFIG_CFG80211_REG_DEBUG
-		/* We want to find out exactly why when debugging */
-		WARN_ON(err);
-#endif
 	}
 
 	/*