diff options
author | Dave Airlie <airlied@redhat.com> | 2017-06-16 13:58:27 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-06-16 13:58:27 +1000 |
commit | 925344ccc91d7a7fd84cab2dece1c34bbd86fd8c (patch) | |
tree | bd4110dc5a3b70a5674b9d6d5340cc1889f5d6e8 /drivers/net/wireless/intel/iwlwifi/iwl-8000.c | |
parent | a6821698918a579e7219d706092e83f367f01ba2 (diff) | |
parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) |
BackMerge tag 'v4.12-rc5' into drm-next
Linux 4.12-rc5 for nouveau fixes
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-8000.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c index b9718c0cf174..89137717c1fc 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c @@ -74,8 +74,8 @@ #define IWL8265_UCODE_API_MAX 30 /* Lowest firmware API version supported */ -#define IWL8000_UCODE_API_MIN 17 -#define IWL8265_UCODE_API_MIN 20 +#define IWL8000_UCODE_API_MIN 22 +#define IWL8265_UCODE_API_MIN 22 /* NVM versions */ #define IWL8000_NVM_VERSION 0x0a1d |