Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / iwl-8000.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/iwlwifi/iwl-8000.c
index 197abe43ddc532eb418f8271fafaff0f7e0218b8..0116e5a4c39389ac4123100bf1486d96c11ad10a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-8000.c
@@ -72,10 +72,10 @@
 #define IWL8000_UCODE_API_MAX  17
 
 /* Oldest version we won't warn about */
-#define IWL8000_UCODE_API_OK   12
+#define IWL8000_UCODE_API_OK   13
 
 /* Lowest firmware API version supported */
-#define IWL8000_UCODE_API_MIN  12
+#define IWL8000_UCODE_API_MIN  13
 
 /* NVM versions */
 #define IWL8000_NVM_VERSION            0x0a1d
@@ -107,7 +107,7 @@
 
 static const struct iwl_base_params iwl8000_base_params = {
        .eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,
-       .num_of_queues = IWLAGN_NUM_QUEUES,
+       .num_of_queues = 31,
        .pll_cfg_val = 0,
        .shadow_ram_support = true,
        .led_compensation = 57,