diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-03 13:06:43 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-03 13:06:43 -0800 |
commit | fd95240568977ebd1ebb15b071464e0e392cde1a (patch) | |
tree | 6458cf8f33a8b8ab6a8098208de29c83206ca3aa /drivers/net/wireless/ath/ath9k/ar9002_hw.c | |
parent | sch_choke: Need linux/vmalloc.h (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
download | linux-dev-fd95240568977ebd1ebb15b071464e0e392cde1a.tar.xz linux-dev-fd95240568977ebd1ebb15b071464e0e392cde1a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9002_hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c index f8a7771faee2..f44c84ab5dce 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c @@ -426,9 +426,8 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, } /* WAR for ASPM system hang */ - if (AR_SREV_9280(ah) || AR_SREV_9285(ah) || AR_SREV_9287(ah)) { + if (AR_SREV_9285(ah) || AR_SREV_9287(ah)) val |= (AR_WA_BIT6 | AR_WA_BIT7); - } if (AR_SREV_9285E_20(ah)) val |= AR_WA_BIT23; |