1 files changed, 9 insertions, 28 deletions

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index d1d18f34d272..3c3bc9e579ed 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -12,36 +12,17 @@ config CFG80211_REG_DEBUG
 
 config WIRELESS_OLD_REGULATORY
         bool "Old wireless static regulatory definitions"
-        default y
+        default n
         ---help---
           This option enables the old static regulatory information
-          and uses it within the new framework. This is available
-          temporarily as an option to help prevent immediate issues
-          due to the switch to the new regulatory framework which
-          does require a new userspace application which has the
-          database of regulatory information (CRDA) and another for
-          setting regulatory domains (iw).
-
-          For more information see:
-
-          http://wireless.kernel.org/en/developers/Regulatory/CRDA
-          http://wireless.kernel.org/en/users/Documentation/iw
-
-          It is important to note though that if you *do* have CRDA present
-          and if this option is enabled CRDA *will* be called to update the
-          regulatory domain (for US and JP only). Support for letting the user
-          set the regulatory domain through iw is also supported. This option
-          mainly exists to leave around for a kernel release some old static
-          regulatory domains that were defined and to keep around the old
-          ieee80211_regdom module parameter. This is being phased out and you
-          should stop using them ASAP.
-
-          Note: You will need CRDA if you want 802.11d support
-
-          Say Y unless you have installed a new userspace application.
-          Also say Y if have one currently depending on the ieee80211_regdom
-          module parameter and cannot port it to use the new userspace
-          interfaces.
+          and uses it within the new framework. This option is available
+          for historical reasons and it is advised to leave it off.
+
+          For details see:
+
+          http://wireless.kernel.org/en/developers/Regulatory
+
+          Say N and if you say Y, please tell us why. The default is N.
 
 config WIRELESS_EXT
         bool "Wireless extensions"