diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-12 11:06:52 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-12 11:06:52 -0500 |
| commit | 4fe0c75eedb15af13859ef123db17fefed5af7ae (patch) | |
| tree | 6ed38d8e2e0ae457d10a2af2e496e9ecb4d34e08 /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | 8457703f1e86aaf0f134402dd1e09e1f13e65222 (diff) | |
| parent | 9c35d7d2368f54313b988a01c408e5cf863ffd9e (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
| -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 ce6127caabdf..bbb8a5b35662 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_SCAN_WHILE_IDLE | | ||
| 117 | IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | | 116 | IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | |
| 118 | IEEE80211_HW_SUPPORTS_PS | | 117 | IEEE80211_HW_SUPPORTS_PS | |
| 119 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | | 118 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | |