summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-25 21:14:33 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-25 21:14:33 +0100
commit79ae79c9aa496309ecc96a2c00b5427735dd3370 (patch)
tree4c4531bfc67ab559a7261e71e434b3fd716aeeb9 /drivers
parentp54pci: update receive dma buffers before and after processing (diff)
parentiwlagn: Support new 5000 microcode. (diff)
downloadlinux-79ae79c9aa496309ecc96a2c00b5427735dd3370.tar.xz
linux-79ae79c9aa496309ecc96a2c00b5427735dd3370.zip
Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers')
-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 79ab0a6b1386..537fb8c84e3a 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 */