diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
commit | af31ff8a1496c68089c3a2ff50d45c64ec765d34 (patch) | |
tree | 5671465bb6ba3a17b66ce04eb7fab4220c70a73b /drivers/net/wireless/ath/wcn36xx/dxe.h | |
parent | 535f95d0a6164c60f3c34a0864d653e016decde1 (diff) | |
parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151008.0
Conflicting files:
arch/arm64/configs/defconfig
Diffstat (limited to 'drivers/net/wireless/ath/wcn36xx/dxe.h')
-rw-r--r-- | drivers/net/wireless/ath/wcn36xx/dxe.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.h b/drivers/net/wireless/ath/wcn36xx/dxe.h index 35ee7e966bd2..f869fd3a9951 100644 --- a/drivers/net/wireless/ath/wcn36xx/dxe.h +++ b/drivers/net/wireless/ath/wcn36xx/dxe.h @@ -243,6 +243,7 @@ struct wcn36xx_dxe_ctl { }; struct wcn36xx_dxe_ch { + spinlock_t lock; enum wcn36xx_dxe_ch_type ch_type; void *cpu_addr; dma_addr_t dma_addr; |