diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/ath/ath5k/initvals.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/initvals.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/initvals.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c index 18eb5190ce4b..8fa439308828 100644 --- a/drivers/net/wireless/ath/ath5k/initvals.c +++ b/drivers/net/wireless/ath/ath5k/initvals.c | |||
| @@ -560,8 +560,8 @@ static const struct ath5k_ini ar5212_ini_common_start[] = { | |||
| 560 | { AR5K_SLEEP0, 0x0002aaaa }, | 560 | { AR5K_SLEEP0, 0x0002aaaa }, |
| 561 | { AR5K_SLEEP1, 0x02005555 }, | 561 | { AR5K_SLEEP1, 0x02005555 }, |
| 562 | { AR5K_SLEEP2, 0x00000000 }, | 562 | { AR5K_SLEEP2, 0x00000000 }, |
| 563 | { AR5K_BSS_IDM0, 0xffffffff }, | 563 | { AR_BSSMSKL, 0xffffffff }, |
| 564 | { AR5K_BSS_IDM1, 0x0000ffff }, | 564 | { AR_BSSMSKU, 0x0000ffff }, |
| 565 | { AR5K_TXPC, 0x00000000 }, | 565 | { AR5K_TXPC, 0x00000000 }, |
| 566 | { AR5K_PROFCNT_TX, 0x00000000 }, | 566 | { AR5K_PROFCNT_TX, 0x00000000 }, |
| 567 | { AR5K_PROFCNT_RX, 0x00000000 }, | 567 | { AR5K_PROFCNT_RX, 0x00000000 }, |