softmac: mark as obsolete and schedule for removal

Schedule softmac for for removal in the 2.6.26 development window.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 8d5f9f8b7a78e5f07e84d1837af3afed9e9e8948..ec50a2ee7ddd1bfdec2c6b6e2810df6df26ec7a8 100644 (file)
--- 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 1438adedbc83b04c26cbc6726804852f40c7b256..bd501046c9c0c0ef4fa5512e7c565e62f53e24a0 100644 (file)
--- 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"