From: Johannes Berg Date: Fri, 15 Feb 2013 22:39:17 +0000 (+0100) Subject: iwlwifi: mvm: fix merge error X-Git-Tag: accepted/tizen/common/20141203.182822~2684^2~28^2^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b18bf9733c4ca4db6fdb692895fabc9d934b7303;p=platform%2Fkernel%2Flinux-arm64.git 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 --- diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index e27eb97..6fb084f 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) IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_QUEUE_CONTROL | IEEE80211_HW_WANT_MONITOR_VIF | - IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | IEEE80211_HW_AMPDU_AGGREGATION;