summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-06-09 01:27:53 +0200
committerJames Morris <jmorris@namei.org>2009-06-09 01:27:53 +0200
commit0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch)
tree1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /drivers/net/wireless/iwlwifi/iwl-5000.c
parentintegrity: ima audit dentry_open failure (diff)
parentasync: Fix lack of boot-time console due to insufficient synchronization (diff)
downloadlinux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz
linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-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 e5ca2511a81a..9452461ce864 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -46,7 +46,7 @@
#include "iwl-6000-hw.h"
/* Highest firmware API version supported */
-#define IWL5000_UCODE_API_MAX 1
+#define IWL5000_UCODE_API_MAX 2
#define IWL5150_UCODE_API_MAX 2
/* Lowest firmware API version supported */