diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-24 22:35:12 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-24 22:35:12 -0800 |
commit | 1b0db64fb7693c1a131b7bcc38f7bc63fb396850 (patch) | |
tree | f393ebcc4496de2424d3f624c3623194e19c8b22 /drivers/net/wireless/ath/ath9k/hw.c | |
parent | 26f70e1202b3c66c4f63b8b25e0419dd0b3a91e3 (diff) | |
parent | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index f9cf81551817..9a3438174f86 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1100,7 +1100,6 @@ static bool ath9k_hw_set_reset_power_on(struct ath_hw *ah) REG_WRITE(ah, AR_RC, AR_RC_AHB); REG_WRITE(ah, AR_RTC_RESET, 0); - udelay(2); REGWRITE_BUFFER_FLUSH(ah); |