summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-25 15:14:33 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-02-25 15:14:33 -0500
commit79ae79c9aa496309ecc96a2c00b5427735dd3370 (patch)
tree4c4531bfc67ab559a7261e71e434b3fd716aeeb9 /drivers/net
parent0bf719dfdecc5552155cbec78e49fa06e531e35c (diff)
parent41504cce240f791f1e16561db95728c5537fbad9 (diff)
downloadop-kernel-dev-79ae79c9aa496309ecc96a2c00b5427735dd3370.zip
op-kernel-dev-79ae79c9aa496309ecc96a2c00b5427735dd3370.tar.gz
Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 79ab0a6..537fb8c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -51,7 +51,7 @@
#include "iwl-agn-debugfs.h"
/* Highest firmware API version supported */
-#define IWL5000_UCODE_API_MAX 2
+#define IWL5000_UCODE_API_MAX 5
#define IWL5150_UCODE_API_MAX 2
/* Lowest firmware API version supported */
OpenPOWER on IntegriCloud