diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 17:39:17 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 14:16:26 -0500 |
commit | b18bf9733c4ca4db6fdb692895fabc9d934b7303 (patch) | |
tree | 981a01386be5098aac692b96c203b5245cad8c2a /drivers/net/wireless | |
parent | e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38 (diff) |
iwlwifi: mvm: fix merge error
The iwlwifi-next tree removed IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC
while the mac80211-next tree removed
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index e27eb9724112..6fb084f2c257 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -113,7 +113,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) | |||
113 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | | 113 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | |
114 | IEEE80211_HW_QUEUE_CONTROL | | 114 | IEEE80211_HW_QUEUE_CONTROL | |
115 | IEEE80211_HW_WANT_MONITOR_VIF | | 115 | IEEE80211_HW_WANT_MONITOR_VIF | |
116 | IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | | ||
117 | IEEE80211_HW_SUPPORTS_PS | | 116 | IEEE80211_HW_SUPPORTS_PS | |
118 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | | 117 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | |
119 | IEEE80211_HW_AMPDU_AGGREGATION; | 118 | IEEE80211_HW_AMPDU_AGGREGATION; |