diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-07-08 12:20:30 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-07-08 12:20:30 +0300 |
| commit | 26124f4b773078bce9d240be8c3f87217a90e80b (patch) | |
| tree | 0adb2c36bbe3cbf671c21d10d74b94e8c9b82035 /drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | |
| parent | 300c32ca84f5006ccbbf37f5207b6311aeccc5c8 (diff) | |
| parent | 6f482e37b75d4e56cdb9b56ae7057f3ce67097bc (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2016-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* work on DQA continued
* SAR BIOS implementation
* some work on debugging capabilities
* added support for GCMP encryption
* data path rework in preparation for new HW
* some cleanup to remove transport dependency on mac80211
* support for MSIx in preparation for new HW
* lots of work in preparation for HW support (9000 and a000 series)
* general cleanups
* general bugfixes
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-modparams.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h index 0379899dc847..4d32b10fe50c 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h @@ -66,7 +66,6 @@ #include <linux/types.h> #include <linux/spinlock.h> #include <linux/gfp.h> -#include <net/mac80211.h> extern struct iwl_mod_params iwlwifi_mod_params; |