diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 19:12:41 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 19:12:41 (GMT) |
commit | cb180840a0c6bff7c0787373c23cefdf20417a27 (patch) | |
tree | b291b4df78fe08c35297271163b71fd86350a53c /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
parent | 5631becbb8703d73239e097d222b183aa4f24e40 (diff) | |
parent | 8eb3871076875f247483f4a1fe6713e6d440c53e (diff) | |
download | linux-fsl-qoriq-cb180840a0c6bff7c0787373c23cefdf20417a27.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 4e10aae..ad39a22 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -689,16 +689,11 @@ void iwl_mvm_bt_coex_vif_assoc(struct iwl_mvm *mvm, struct ieee80211_vif *vif); void iwl_mvm_beacon_filter_debugfs_parameters(struct ieee80211_vif *vif, struct iwl_beacon_filter_cmd *cmd); -int iwl_mvm_dbgfs_set_fw_dbg_log(struct iwl_mvm *mvm); #else static inline void iwl_mvm_beacon_filter_debugfs_parameters(struct ieee80211_vif *vif, struct iwl_beacon_filter_cmd *cmd) {} -static inline int iwl_mvm_dbgfs_set_fw_dbg_log(struct iwl_mvm *mvm) -{ - return 0; -} #endif int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm, struct ieee80211_vif *vif); |