1 files changed, 26 insertions, 4 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index e47c0ff8ba7a..8365f52a3548 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,7 +6,31 @@ be removed from this file.
 
 ---------------------------
 
-What:   old static regulatory information and ieee80211_regdom module parameter
+What:   The ieee80211_regdom module parameter
+When:   March 2010
+
+Why:    This was inherited by the CONFIG_WIRELESS_OLD_REGULATORY code,
+        and currently serves as an option for users to define an
+        ISO / IEC 3166 alpha2 code for the country they are currently
+        present in. Although there are userspace API replacements for this
+        through nl80211 distributions haven't yet caught up with implementing
+        decent alternatives through standard GUIs. Although available as an
+        option through iw or wpa_supplicant its just a matter of time before
+        distributions pick up good GUI options for this. The ideal solution
+        would actually consist of intelligent designs which would do this for
+        the user automatically even when travelling through different countries.
+        Until then we leave this module parameter as a compromise.
+
+        When userspace improves with reasonable widely-available alternatives for
+        this we will no longer need this module parameter. This entry hopes that
+        by the super-futuristically looking date of "March 2010" we will have
+        such replacements widely available.
+
+Who:    Luis R. Rodriguez <lrodriguez@atheros.com>
+
+---------------------------
+
+What:   old static regulatory information
 When:   2.6.29
 Why:    The old regulatory infrastructure has been replaced with a new one
         which does not require statically defined regulatory domains. We do
@@ -17,9 +41,7 @@ Why:	The old regulatory infrastructure has been replaced with a new one
                 * JP
                 * EU
         and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was
-        set. We also kept around the ieee80211_regdom module parameter in case
-        some applications were relying on it. Changing regulatory domains
-        can now be done instead by using nl80211, as is done with iw.
+        set.
 Who:    Luis R. Rodriguez <lrodriguez@atheros.com>
 
 ---------------------------