2 files changed, 11 insertions, 2 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 8d5f9f8b7a78..ec50a2ee7ddd 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -315,3 +315,11 @@ Why:	This driver's functionality has been replaced by the
 Who:    John W. Linville <linville@tuxdriver.com>
 
 ---------------------------
+
+What:   iee80211 softmac wireless networking component
+When:   2.6.26 (or after removal of bcm43xx and port of zd1211rw to mac80211)
+Files:  net/ieee80211/softmac
+Why:    No in-kernel drivers will depend on it any longer.
+Who:    John W. Linville <linville@tuxdriver.com>
+
+---------------------------
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig
index 1438adedbc83..bd501046c9c0 100644
--- a/net/ieee80211/Kconfig
+++ b/net/ieee80211/Kconfig
@@ -1,8 +1,9 @@
 config IEEE80211
-        tristate "Generic IEEE 802.11 Networking Stack"
+        tristate "Generic IEEE 802.11 Networking Stack (DEPRECATED)"
         ---help---
         This option enables the hardware independent IEEE 802.11
-        networking stack.
+        networking stack.  This component is deprecated in favor of the
+        mac80211 component.
 
 config IEEE80211_DEBUG
         bool "Enable full debugging output"