3 files changed, 16 insertions, 4 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 25370662cc5d..8d5f9f8b7a78 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -306,3 +306,12 @@ Why:	These drivers are superseded by i810fb, intelfb and savagefb.
 Who:    Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
+
+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 <linville@tuxdriver.com>
+
+---------------------------
diff --git a/MAINTAINERS b/MAINTAINERS
index 6de909fe2013..2c848b46dbac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -809,7 +809,7 @@ P:	Stefano Brivio
 M:      stefano.brivio@polimi.it
 L:      linux-wireless@vger.kernel.org
 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 ce397e4284f4..0159701e8456 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)"