Skip to content

Commit

Permalink
compat-drivers: fix driver-select for atheros drivers
Browse files Browse the repository at this point in the history
The addition of the new wil6210 driver added a new ATH_CARDS
option to be used to describe Atheros cards and now uses ATH_COMMON
for the common module ath. This requires fixing the driver-select
script so that the drivers are enabled properly.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
  • Loading branch information
mcgrof committed Jan 22, 2013
1 parent 886b89d commit 3bd8075
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions scripts/driver-select
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,13 @@ function select_ath_driver
disable_var_01
}

function select_ath_no_common
{
backup_file $ATH_MAKEFILE
perl -i -ne 'print if /'$1'/' $ATH_MAKEFILE
disable_var_01
}

function select_ath9k_driver
{
select_ath_driver CONFIG_ATH9K_HW
Expand Down Expand Up @@ -347,15 +354,15 @@ case $1 in
;;
# Group drivers
atheros)
select_drivers CONFIG_ATH_COMMON \
select_drivers CONFIG_ATH_CARDS \
CONFIG_COMPAT_ZD1211RW
disable_staging
disable_bt_usb_ethernet_var
disable_var_01
;;
ath)
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
disable_var_01
;;
intel)
Expand Down Expand Up @@ -415,45 +422,45 @@ case $1 in
ath5k)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
select_ath_driver CONFIG_ATH5K
#patch -p1 < enable-older-kernels/enable-2.6.23.patch
;;
ath9k)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
select_ath9k_driver
;;
ath9k_ap)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
select_ath9k_driver_ap
;;
carl9170)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
select_ath_driver CONFIG_CARL9170
;;
ath9k_htc)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
select_ath9k_driver
;;
ath6kl)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_drivers CONFIG_ATH_CARDS
select_ath_driver CONFIG_ATH6KL
;;
wil6210)
disable_staging
disable_bt_usb_ethernet_var
select_drivers CONFIG_ATH_COMMON
select_ath_driver CONFIG_WIL6210
select_drivers CONFIG_ATH_CARDS
select_ath_no_common CONFIG_WIL6210
;;
brcmsmac)
disable_staging
Expand Down

0 comments on commit 3bd8075

Please sign in to comment.