summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2016-04-07 18:44:37 (GMT)
committerKalle Valo <kvalo@codeaurora.org>2016-04-07 18:44:37 (GMT)
commit20ac1b325d8d526211b1276ecf9b64b7e8369f50 (patch)
treebe1ba1632c74adf873f505cb1251ee07ab6fbdd4 /include
parent4646968b94bdf88ae3c507c347d03acd5798939d (diff)
parent689de38e37179c6f524dd003e1dae92042f8f5cd (diff)
downloadlinux-20ac1b325d8d526211b1276ecf9b64b7e8369f50.tar.xz
Merge ath-next from ath.git
ath.git patches for 4.7. Major changes: ath10k * implement push-pull tx model using mac80211 software queuing support * enable scan in AP mode (NL80211_FEATURE_AP_SCAN) wil6210 * add basic PBSS (Personal Basic Service Set) support * add initial P2P support * add oob_mode module parameter
Diffstat (limited to 'include')
-rw-r--r--include/linux/ath9k_platform.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h
index 33eb274..e66153d 100644
--- a/include/linux/ath9k_platform.h
+++ b/include/linux/ath9k_platform.h
@@ -31,6 +31,10 @@ struct ath9k_platform_data {
u32 gpio_mask;
u32 gpio_val;
+ u32 bt_active_pin;
+ u32 bt_priority_pin;
+ u32 wlan_active_pin;
+
bool endian_check;
bool is_clk_25mhz;
bool tx_gain_buffalo;