X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2Fwireless%2FKconfig;h=e28e2b8fa436edc1290e8704bab478781a308111;hb=02e68a3da0fbdb178cdec54b7db48edeefd1691d;hp=ae7f2262dfb5f37253f5ecc3ac705a948add04d6;hpb=6ab33d51713d6d60c7677c0d020910a8cb37e513;p=linux-2.6-omap-h63xx.git

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index ae7f2262dfb..e28e2b8fa43 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -1,6 +1,15 @@
 config CFG80211
         tristate "Improved wireless configuration API"
 
+config CFG80211_REG_DEBUG
+	bool "cfg80211 regulatory debugging"
+	depends on CFG80211
+	default n
+	---help---
+	  You can enable this if you want to debug regulatory changes.
+
+	  If unsure, say N.
+
 config NL80211
 	bool "nl80211 new netlink interface support"
 	depends on CFG80211
@@ -40,6 +49,8 @@ config WIRELESS_OLD_REGULATORY
 	  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
@@ -82,3 +93,12 @@ config LIB80211
 
 	  Drivers should select this themselves if needed.  Say Y if
 	  you want this built into your kernel.
+
+config LIB80211_CRYPT_WEP
+	tristate
+
+config LIB80211_CRYPT_CCMP
+	tristate
+
+config LIB80211_CRYPT_TKIP
+	tristate