---

yaml --- r: 247619 b: refs/heads/master c: 9e4425f h: refs/heads/master i: 247617: e249922 247615: 3627bb2 v: v3
git-mirror · May 5, 2011 · c26b558 · c26b558
1 parent a2f4fe7
commit c26b558
Show file tree

Hide file tree

Showing 462 changed files with 22,132 additions and 60,612 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4daf50f20256e0022c87c1609226e971a70c82fd
+refs/heads/master: 9e4425fff9e0a0fb6a8c705777ed861f991f8747
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-bcma b/trunk/Documentation/ABI/testing/sysfs-bus-bcma
diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/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/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1224,6 +1224,13 @@ W:	http://wireless.kernel.org/en/users/Drivers/ath9k
 S:	Supported
 F:	drivers/net/wireless/ath/ath9k/
 
+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:	Obsolete
+F:	drivers/net/wireless/ath/ar9170/
+
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 M:	Christian Lamparter <chunkeey@googlemail.com>
 L:	linux-wireless@vger.kernel.org
@@ -3348,12 +3355,6 @@ F:	Documentation/wimax/README.i2400m
 F:	drivers/net/wimax/i2400m/
 F:	include/linux/wimax/i2400m.h
 
-INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
-M:	Stanislaw Gruszka <sgruszka@redhat.com>
-L:	linux-wireless@vger.kernel.org
-S:	Supported
-F:	drivers/net/wireless/iwlegacy/
-
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:	Intel Linux Wireless <ilw@linux.intel.com>
@@ -5810,13 +5811,6 @@ S:	Maintained
 F:	drivers/ssb/
 F:	include/linux/ssb/
 
-BROADCOM SPECIFIC AMBA DRIVER (BCMA)
-M:	Rafał Miłecki <zajec5@gmail.com>
-L:	linux-wireless@vger.kernel.org
-S:	Maintained
-F:	drivers/bcma/
-F:	include/linux/bcma/
-
 SONY VAIO CONTROL DEVICE DRIVER
 M:	Mattia Dongili <malattia@linux.it>
 L:	platform-driver-x86@vger.kernel.org

diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
@@ -68,8 +68,6 @@ source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"
 
-source "drivers/bcma/Kconfig"
-
 source "drivers/mfd/Kconfig"
 
 source "drivers/regulator/Kconfig"

diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
@@ -110,7 +110,6 @@ obj-$(CONFIG_HID)		+= hid/
 obj-$(CONFIG_PPC_PS3)		+= ps3/
 obj-$(CONFIG_OF)		+= of/
 obj-$(CONFIG_SSB)		+= ssb/
-obj-$(CONFIG_BCMA)		+= bcma/
 obj-$(CONFIG_VHOST_NET)		+= vhost/
 obj-$(CONFIG_VLYNQ)		+= vlynq/
 obj-$(CONFIG_STAGING)		+= staging/

diff --git a/trunk/drivers/bcma/Kconfig b/trunk/drivers/bcma/Kconfig
diff --git a/trunk/drivers/bcma/Makefile b/trunk/drivers/bcma/Makefile
diff --git a/trunk/drivers/bcma/README b/trunk/drivers/bcma/README
diff --git a/trunk/drivers/bcma/TODO b/trunk/drivers/bcma/TODO
diff --git a/trunk/drivers/bcma/bcma_private.h b/trunk/drivers/bcma/bcma_private.h
diff --git a/trunk/drivers/bcma/core.c b/trunk/drivers/bcma/core.c
diff --git a/trunk/drivers/bcma/driver_chipcommon.c b/trunk/drivers/bcma/driver_chipcommon.c