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

Commit bd842171 authored by Kalle Valo's avatar Kalle Valo
Browse files

ti: unify Kconfig with other vendors 



Rename WL_TI to WLAN_VENDOR_TI to match with other vendor configs and make sure
that it's enabled by default in new configs. Convert menuconfigs to regular
configs to unify the wireless drivers menuconfig. Part of reorganising wireless
drivers directory and Kconfig.

Also remove WLCORE dependency to WL_TI. It should not be needed as WLCORE is
already under if  WLAN_VENDOR_TI.

Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7b09ed5a

drivers/net/wireless/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ source "drivers/net/wireless/ralink/Kconfig" 
source "drivers/net/wireless/realtek/Kconfig"

source "drivers/net/wireless/rsi/Kconfig"

source "drivers/net/wireless/st/Kconfig"

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

source "drivers/net/wireless/zydas/Kconfig"



config PCMCIA_RAYCS
@@ -99,6 +100,5 @@ config MAC80211_HWSIM 
	  called mac80211_hwsim.  If unsure, say N.



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

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



endif # WLAN

drivers/net/wireless/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/ 
obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/

obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/

obj-$(CONFIG_WLAN_VENDOR_ST) += st/

obj-$(CONFIG_WLAN_VENDOR_TI) += ti/

obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/



# 16-bit wireless PCMCIA client drivers
@@ -25,5 +26,3 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o 
obj-$(CONFIG_ATH_CARDS)		+= ath/



obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
 


obj-$(CONFIG_WL_TI)	+= ti/

drivers/net/wireless/ti/Kconfig

+11 −7
Original line number Diff line number Diff line 
menuconfig WL_TI

	bool "TI Wireless LAN support"

config WLAN_VENDOR_TI

	bool "Texas Instrument devices"

	default y

	---help---

	  This section contains support for all the wireless drivers

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

	  family.

	  If you have a wireless card belonging to this class, say Y.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about  cards. If you say Y, you will be asked for

	  your specific card in the following questions.



if WL_TI

if WLAN_VENDOR_TI

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

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

source "drivers/net/wireless/ti/wl18xx/Kconfig"
@@ -21,4 +25,4 @@ config WILINK_PLATFORM_DATA 
	Small platform data bit needed to pass data to the sdio modules.





endif # WL_TI
 
endif # WLAN_VENDOR_TI

drivers/net/wireless/ti/wl1251/Kconfig

+1 −1
Original line number Diff line number Diff line 
menuconfig WL1251

config WL1251

	tristate "TI wl1251 driver support"

	depends on MAC80211

	select FW_LOADER

drivers/net/wireless/ti/wlcore/Kconfig

+1 −1
Original line number Diff line number Diff line 
config WLCORE

	tristate "TI wlcore support"

	depends on WL_TI && MAC80211

	depends on MAC80211

	select FW_LOADER

	---help---

	  This module contains the main code for TI WLAN chips.  It abstracts