diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-09-28 10:28:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-28 10:28:09 -0400 |
commit | 0874073570d9184a169a4ae2abbe8dbcb71878e9 (patch) | |
tree | 81af47abc50641f911e3b5833850357a48a82be8 /drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | |
parent | cd32984f64cb4fdd84e33f30da1f10582fc43cbf (diff) | |
parent | ba54238552625aad2d75f455a4d3db18ea7dec68 (diff) | |
download | linux-0874073570d9184a169a4ae2abbe8dbcb71878e9.tar.gz |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h index f2c6f2316a3b..08e9341f6368 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h @@ -1514,7 +1514,7 @@ static const u32 ar9300_2p2_mac_core[][2] = { {0x00008258, 0x00000000}, {0x0000825c, 0x40000000}, {0x00008260, 0x00080922}, - {0x00008264, 0x9bc00010}, + {0x00008264, 0x9d400010}, {0x00008268, 0xffffffff}, {0x0000826c, 0x0000ffff}, {0x00008270, 0x00000000}, |