summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-15 18:55:20 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-15 18:55:20 -0700
commit4a37390de98547e42ad0cb617bd2f2d452f2d4c7 (patch)
treedb85234eb9e636f27a6571ba1e454d736130b829
parent4a2b9c3756077c05dd8666e458a751d2248b61b6 (diff)
parentfea41cc9b1af5f65fecf4013ad62284e6ae3a78c (diff)
downloadop-kernel-dev-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.zip
op-kernel-dev-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index e8e1c2d..27c5007 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -49,7 +49,7 @@
#include "iwl-agn-debugfs.h"
/* Highest firmware API version supported */
-#define IWL1000_UCODE_API_MAX 3
+#define IWL1000_UCODE_API_MAX 5
#define IWL100_UCODE_API_MAX 5
/* Lowest firmware API version supported */
OpenPOWER on IntegriCloud