Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7e70158 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of... 

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
parents 24743537 252f4bf4

Documentation/feature-removal-schedule.txt

+0 −11
Original line number Diff line number Diff line
@@ -35,17 +35,6 @@ 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

MAINTAINERS

+6 −7
Original line number Diff line number Diff line
@@ -1224,13 +1224,6 @@ 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
@@ -3355,6 +3348,12 @@ 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>

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -284,5 +284,6 @@ source "drivers/net/wireless/rtlwifi/Kconfig" 
source "drivers/net/wireless/wl1251/Kconfig"

source "drivers/net/wireless/wl12xx/Kconfig"

source "drivers/net/wireless/zd1211rw/Kconfig"

source "drivers/net/wireless/mwifiex/Kconfig"



endif # WLAN

drivers/net/wireless/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -56,3 +56,5 @@ obj-$(CONFIG_WL12XX) += wl12xx/ 
obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/



obj-$(CONFIG_IWM)	+= iwmc3200wifi/



obj-$(CONFIG_MWIFIEX)	+= mwifiex/

drivers/net/wireless/ath/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ config ATH_DEBUG 


source "drivers/net/wireless/ath/ath5k/Kconfig"

source "drivers/net/wireless/ath/ath9k/Kconfig"

source "drivers/net/wireless/ath/ar9170/Kconfig"

source "drivers/net/wireless/ath/carl9170/Kconfig"



endif