diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-12-06 15:35:34 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-06 15:35:34 -0500 |
commit | f435d9eea01309aa7b6c1f134569a7b5957918ae (patch) | |
tree | 2737a48d423a8191671098b15aabd6391af2d23a /drivers/net/wireless/ath/ath.h | |
parent | 5ee493767352314893520ac40aec5bb07d0147e0 (diff) | |
parent | 09f921f83faa49cdea25abfb98c439c01526b89d (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath.h')
-rw-r--r-- | drivers/net/wireless/ath/ath.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h index 20ea68c59f7..26bdbeee424 100644 --- a/drivers/net/wireless/ath/ath.h +++ b/drivers/net/wireless/ath/ath.h @@ -168,6 +168,8 @@ struct ath_common { struct ath_regulatory regulatory; const struct ath_ops *ops; const struct ath_bus_ops *bus_ops; + + bool btcoex_enabled; }; struct sk_buff *ath_rxbuf_alloc(struct ath_common *common, |