diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 11:05:51 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 11:05:51 -0700 |
commit | fda87903f4e9caf87e02d52768c2611e417b7efb (patch) | |
tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 /drivers/net/wireless/ath/ath9k/main.c | |
parent | 1a0703ede4493bd74f9c6b53f782b749e175a88e (diff) | |
parent | 2de0dbc5f6830e7659083d1929f57cb88b16a3b6 (diff) |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next
Conflicts:
drivers/gpio/gpio-pl061.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 93fbe6f40898..d2348a5a7809 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) ath_start_ani(common); } - if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) { + if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) { struct ath_hw_antcomb_conf div_ant_conf; u8 lna_conf; |