diff options
| author | David S. Miller | 2011-03-16 02:55:20 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-03-16 02:55:20 +0100 |
| commit | 4a37390de98547e42ad0cb617bd2f2d452f2d4c7 (patch) | |
| tree | db85234eb9e636f27a6571ba1e454d736130b829 /drivers/net | |
| parent | net_sched: fix ip_tos2prio (diff) | |
| parent | iwlagn: Support new 1000 microcode. (diff) | |
| download | kernel-qcow2-linux-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.tar.gz kernel-qcow2-linux-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.tar.xz kernel-qcow2-linux-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 2 |
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 e8e1c2dc8659..27c5007e577c 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 */ |