Search Linux Wireless

[PATCH 2/2] compat-wireless: driver-select: update after introduction of CONFIG_WL_TI

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The introduction of CONFIG_WL_TI broke selecting the TI drivers using
driver-select.  Fix this, and while we're at it, teach the script about
wl18xx as well.

Signed-off-by: Steven Luo <steven@xxxxxxxxxxxxx>
---
 scripts/driver-select |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/driver-select b/scripts/driver-select
index 48a43b7..03dd9d0 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -10,6 +10,7 @@ ATH_MAKEFILE="drivers/net/wireless/ath/Makefile"
 ATH9K_MAKEFILE="drivers/net/wireless/ath/ath9k/Makefile"
 BRCM80211_MAKEFILE="drivers/net/wireless/brcm80211/Makefile"
 RT2X00_MAKEFILE="drivers/net/wireless/rt2x00/Makefile"
+TI_MAKEFILE="drivers/net/wireless/ti/Makefile"
 NET_WIRELESS_MAKEFILE="net/wireless/Makefile"
 EEPROM_MAKEFILE="drivers/misc/eeprom/Makefile"
 DRIVERS_NET_ATHEROS="drivers/net/ethernet/atheros/Makefile"
@@ -252,6 +253,12 @@ function select_ath9k_driver_ap
 	perl -i -ne 'print if ! /CONFIG_COMPAT_ATH9K_RATE_CONTROL/ ' $COMPAT_CONFIG_CW
 }
 
+function select_ti_drivers
+{
+	select_drivers CONFIG_WL_TI
+	select_drivers_from_makefile $TI_MAKEFILE $@
+}
+
 function select_brcm80211_driver 
 {
 	backup_file $BRCM80211_MAKEFILE
@@ -364,8 +371,7 @@ case $1 in
 		disable_lib80211
 		;;
 	ti)
-		select_drivers		CONFIG_WL1251 \
-					CONFIG_WL12XX
+		select_drivers		CONFIG_WL_TI
 		disable_staging
 		disable_var_01
 		;;
@@ -451,12 +457,17 @@ case $1 in
 		disable_var_02
 		;;
 	wl1251)
-		select_drivers		CONFIG_WL1251
+		select_ti_drivers	CONFIG_WL1251
 		disable_staging
 		disable_var_01
 		;;
 	wl12xx)
-		select_drivers		CONFIG_WL12XX
+		select_ti_drivers	CONFIG_WL12XX
+		disable_staging
+		disable_var_01
+		;;
+	wl18xx)
+		select_ti_drivers	CONFIG_WL18XX
 		disable_staging
 		disable_var_01
 		;;
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux