Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
Amended based on suggestions from Stefano...

 Documentation/feature-removal-schedule.txt |    9 +++++++++
 MAINTAINERS                                |    2 +-
 drivers/net/wireless/bcm43xx/Kconfig       |    9 ++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Documentation/feature-removal-schedule.txt 
b/Documentation/feature-removal-schedule.txt
index 20c4c8b..c057e36 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -333,3 +333,12 @@ Why:       This driver has been marked obsolete for many 
years.
 Who:   Stephen Hemminger <[EMAIL PROTECTED]>
 
 ---------------------------
+
+What:  bcm43xx wireless network driver
+When:  2.6.26
+Files: drivers/net/wireless/bcm43xx
+Why:   This driver's functionality has been replaced by the
+       mac80211-based b43 and b43legacy drivers.
+Who:   John W. Linville <[EMAIL PROTECTED]>
+
+---------------------------
diff --git a/MAINTAINERS b/MAINTAINERS
index 18b7c8e..2bfc23f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -828,7 +828,7 @@ P:  Stefano Brivio
 M:     [EMAIL PROTECTED]
 L:     [EMAIL PROTECTED]
 W:     http://bcm43xx.berlios.de/
-S:     Maintained
+S:     Obsolete
 
 BEFS FILE SYSTEM
 P:     Sergey S. Kostyliov
diff --git a/drivers/net/wireless/bcm43xx/Kconfig 
b/drivers/net/wireless/bcm43xx/Kconfig
index ce397e4..0159701 100644
--- a/drivers/net/wireless/bcm43xx/Kconfig
+++ b/drivers/net/wireless/bcm43xx/Kconfig
@@ -1,12 +1,15 @@
 config BCM43XX
-       tristate "Broadcom BCM43xx wireless support"
+       tristate "Broadcom BCM43xx wireless support (DEPRECATED)"
        depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && 
EXPERIMENTAL
        select WIRELESS_EXT
        select FW_LOADER
        select HW_RANDOM
        ---help---
-         This is an experimental driver for the Broadcom 43xx wireless chip,
-         found in the Apple Airport Extreme and various other devices.
+         This is an experimental driver for the Broadcom 43xx wireless
+         chip, found in the Apple Airport Extreme and various other
+         devices.  This driver is deprecated and will be removed
+         from the kernel in the near future.  It has been replaced
+         by the b43 and b43legacy drivers.
 
 config BCM43XX_DEBUG
        bool "Broadcom BCM43xx debugging (RECOMMENDED)"
-- 
1.5.3.3

_______________________________________________
Bcm43xx-dev mailing list
Bcm43xx-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev

Reply via email to