Commit f2776834 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

parents e9676695 916ef361

MAINTAINERS

+10 −17
Original line number Diff line number Diff line
@@ -6669,6 +6669,16 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers) 
S:	Maintained

F:	sound/soc/codecs/twl4030*



TI WILINK WIRELESS DRIVERS

M:	Luciano Coelho <coelho@ti.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

W:	http://wireless.kernel.org/en/users/Drivers/wl1251

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

F:	drivers/net/wireless/ti/

F:	include/linux/wl12xx.h



TIPC NETWORK LAYER

M:	Jon Maloy <jon.maloy@ericsson.com>

M:	Allan Stephens <allan.stephens@windriver.com>
@@ -7425,23 +7435,6 @@ M: Miloslav Trmac <mitr@volny.cz> 
S:	Maintained

F:	drivers/input/misc/wistron_btns.c



WL1251 WIRELESS DRIVER

M:	Luciano Coelho <coelho@ti.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl1251

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/wl1251/*



WL1271 WIRELESS DRIVER

M:	Luciano Coelho <coelho@ti.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

F:	drivers/net/wireless/wl12xx/

F:	include/linux/wl12xx.h



WL3501 WIRELESS PCMCIA CARD DRIVER

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

L:	linux-wireless@vger.kernel.org

drivers/net/wireless/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -282,8 +282,7 @@ source "drivers/net/wireless/orinoco/Kconfig" 
source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/rtlwifi/Kconfig"

source "drivers/net/wireless/wl1251/Kconfig"

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

source "drivers/net/wireless/ti/Kconfig"

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

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

drivers/net/wireless/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -51,9 +51,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/ 


obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



obj-$(CONFIG_WL1251)	+= wl1251/

obj-$(CONFIG_WL12XX)	+= wl12xx/

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/

obj-$(CONFIG_WL_TI)	+= ti/



obj-$(CONFIG_IWM)	+= iwmc3200wifi/

drivers/net/wireless/ti/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
menuconfig WL_TI

	bool "TI Wireless LAN support"

	---help---

	  This section contains support for all the wireless drivers

	  for Texas Instruments WLAN chips, such as wl1251 and the wl12xx

	  family.



if WL_TI

source "drivers/net/wireless/ti/wl1251/Kconfig"

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



# keep last for automatic dependencies

source "drivers/net/wireless/ti/wlcore/Kconfig"

endif # WL_TI

drivers/net/wireless/ti/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_WLCORE)			+= wlcore/

obj-$(CONFIG_WL12XX)			+= wl12xx/

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wlcore/

obj-$(CONFIG_WL1251)			+= wl1251/