ar9170usb: mark the old driver as obsolete

AR9170USB will be replaced by carl9170 in the foreseeable
future [2.6.40].

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 8c594c4..ab27485 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -35,6 +35,17 @@ Who: Luis R. Rodriguez <lrodriguez@atheros.com>
 
 ---------------------------
 
+What:  AR9170USB
+When:  2.6.40
+
+Why:   This driver is deprecated and the firmware is no longer
+       maintained. The replacement driver "carl9170" has been
+       around for a while, so the devices are still supported.
+
+Who:   Christian Lamparter <chunkeey@googlemail.com>
+
+---------------------------
+
 What:  IRQF_SAMPLE_RANDOM
 Check: IRQF_SAMPLE_RANDOM
 When:  July 2009

diff --git a/MAINTAINERS b/MAINTAINERS
index 2b35b6c..95482e9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1199,7 +1199,7 @@ ATHEROS AR9170 WIRELESS DRIVER
 M:     Christian Lamparter <chunkeey@web.de>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/en/users/Drivers/ar9170
-S:     Maintained
+S:     Obsolete
 F:     drivers/net/wireless/ath/ar9170/
 
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER

diff --git a/drivers/net/wireless/ath/ar9170/Kconfig b/drivers/net/wireless/ath/ar9170/Kconfig
index d7a4799..7b9672b 100644 (file)
--- a/drivers/net/wireless/ath/ar9170/Kconfig
+++ b/drivers/net/wireless/ath/ar9170/Kconfig
@@ -1,8 +1,10 @@
 config AR9170_USB
-       tristate "Atheros AR9170 802.11n USB support"
+       tristate "Atheros AR9170 802.11n USB support (OBSOLETE)"
        depends on USB && MAC80211
        select FW_LOADER
        help
+         This driver is going to get replaced by carl9170.
+
          This is a driver for the Atheros "otus" 802.11n USB devices.
 
          These devices require additional firmware (2 files).