---

yaml --- r: 78257 b: refs/heads/master c: edae58e h: refs/heads/master i: 78255: f4ef118 v: v3
git-mirror · Jan 28, 2008 · 2a4e3e1 · 2a4e3e1
1 parent 69d7b62
commit 2a4e3e1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 003faaa17793c478ed2babc56a618396e0ef96c2
+refs/heads/master: edae58ead57319b0bcf16e48a32365145c7bf0b7
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/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/trunk/net/ieee80211/Kconfig b/trunk/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"