diff -Naurp wireless-dev-old/net/d80211/Kconfig wireless-dev/net/d80211/Kconfig
--- wireless-dev-old/net/d80211/Kconfig	2006-10-23 13:56:11.000000000 -0400
+++ wireless-dev/net/d80211/Kconfig	2006-10-23 17:04:12.000000000 -0400
@@ -7,6 +7,80 @@ config D80211
 	This option enables the hardware independent IEEE 802.11
 	networking stack.
 
+comment "IEEE80211 - Regulatory Domain Support"
+
+config D80211_REGDOMAIN_ETSI
+	bool "ETSI Regulatory Domain"
+	depends on D80211
+	---help---
+	  This option enables ETSI regulatory domain support to be
+	  built into the kernel. If you live in any of the following countries
+	  you want this:
+	  
+	  * Denmark
+	  * Estonia
+	  * Finland
+	  * Germany
+	  * Iceland
+	  * Ireland
+	  * Italy
+	  * Lithuania
+	  * Luxembourg
+	  * Netherlands
+	  * Norway
+	  * Poland
+	  * Portugal
+	  * Slovenia
+	  * South Africa
+	  * Sweden
+	  * United Kingdom
+	  * France
+	  * Spain
+
+config D80211_REGDOMAIN_FCC
+	bool "FCC Regulatory Domain"
+	depends on D80211
+	---help---
+	  This option enables FCC regulatory domain support to be 
+	  built into the kernel. If you live in any of the following countries
+	  you want this:
+	  
+	  * United States
+	  * Colombia
+	  * Dominican Republic
+	  * Guatemala
+	  * Mexico
+	  * Panama
+	  * Puerto Rico
+
+config D80211_REGDOMAIN_IC
+	bool "IC Regulatory Domain"
+	depends on D80211
+	---help---
+	  This option enables IC regulatory domain support to be 
+	  built into the kernel. If you live in any of the following countries
+	  you want this:
+	  
+	  * Canada
+
+config D80211_REGDOMAIN_MKK
+	bool "MKK Regulatory Domain"
+	depends on D80211
+	---help---
+	  This option enables MKK regulatory domain support to be 
+	  built into the kernel. If you live in any of the following countries
+	  you want this:
+	  
+	  * Japan
+comment ""
+
+#config D80211_REGULATORY_USER
+#	bool "Regulatory domain userspace support"
+#	depends on D80211
+#	---help---
+#	  This option enables updating of regulatory domain database
+#	  through userspace.
+
 config D80211_LEDS
 	bool "Enable LED triggers"
 	depends on D80211
@@ -16,8 +90,6 @@ config D80211_LEDS
 	This option enables a few LED triggers for different
 	packet receive/transmit events.
 
-config D80211_
-
 config D80211_DEBUG
 	bool "Enable debugging output"
 	depends on D80211