From 2a4e3e111e5ed73bb968fe8b877533d6892eaebc Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Wed, 21 Nov 2007 15:24:35 -0500 Subject: [PATCH] --- yaml --- r: 78257 b: refs/heads/master c: edae58ead57319b0bcf16e48a32365145c7bf0b7 h: refs/heads/master i: 78255: f4ef118e96ad12df1c6333e3e409a76136184371 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 8 ++++++++ trunk/net/ieee80211/Kconfig | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ced8e6ecb22f..05e062f199c9 100644 --- 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 index 8d5f9f8b7a78..ec50a2ee7ddd 100644 --- 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 --------------------------- + +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 + +--------------------------- diff --git a/trunk/net/ieee80211/Kconfig b/trunk/net/ieee80211/Kconfig index 1438adedbc83..bd501046c9c0 100644 --- 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"