Skip to content
Commit b18bf973 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent e9b89fcc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment