diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-29 15:23:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-29 15:23:15 -0400 |
| commit | a4765fa7bfb92d5b9de19a503674b6624f95a7ae (patch) | |
| tree | 27fa2b40b2fb4843043cc1583cd139844ee3f5fe /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | 089282fb028198169a0f62f8f833ab6d06bdbb3c (diff) | |
| parent | 9f2a0fac625bcef9c579bcf0b0c904ab1a56e7c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 973c919fdd27..9b8e7e3fcebd 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -310,7 +310,7 @@ struct ath_rx { | |||
| 310 | u8 rxotherant; | 310 | u8 rxotherant; |
| 311 | u32 *rxlink; | 311 | u32 *rxlink; |
| 312 | unsigned int rxfilter; | 312 | unsigned int rxfilter; |
| 313 | spinlock_t rxflushlock; | 313 | spinlock_t pcu_lock; |
| 314 | spinlock_t rxbuflock; | 314 | spinlock_t rxbuflock; |
| 315 | struct list_head rxbuf; | 315 | struct list_head rxbuf; |
| 316 | struct ath_descdma rxdma; | 316 | struct ath_descdma rxdma; |