diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-26 16:38:24 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-26 16:38:24 +0200 |
| commit | 4615fd1551334ae5ce8e118a58d697d61f1c7d58 (patch) | |
| tree | 0fb1d9978e9b594b648e4e21c2461b523955b0a1 /drivers/net/wireless/intel/iwlwifi/iwl-7000.c | |
| parent | 6d808eba602b00f77f26191f45328774ff057cc0 (diff) | |
| parent | 9513c5e18a0dc55a1fc9c890715098ba2315830b (diff) | |
| download | linux-stable-4615fd1551334ae5ce8e118a58d697d61f1c7d58.tar.gz linux-stable-4615fd1551334ae5ce8e118a58d697d61f1c7d58.tar.bz2 linux-stable-4615fd1551334ae5ce8e118a58d697d61f1c7d58.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into next
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-7000.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c index 1a73c7a1da77..bf88ec3a65fa 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c @@ -69,7 +69,7 @@ #include "iwl-agn-hw.h" /* Highest firmware API version supported */ -#define IWL7260_UCODE_API_MAX 17 +#define IWL7260_UCODE_API_MAX 19 /* Oldest version we won't warn about */ #define IWL7260_UCODE_API_OK 13 |