diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:55:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:55:20 -0700 |
| commit | 4a37390de98547e42ad0cb617bd2f2d452f2d4c7 (patch) | |
| tree | db85234eb9e636f27a6571ba1e454d736130b829 /drivers | |
| parent | 4a2b9c3756077c05dd8666e458a751d2248b61b6 (diff) | |
| parent | fea41cc9b1af5f65fecf4013ad62284e6ae3a78c (diff) | |
| download | linux-3.10-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.tar.gz linux-3.10-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.tar.bz2 linux-3.10-4a37390de98547e42ad0cb617bd2f2d452f2d4c7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers')
| -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 e8e1c2dc865..27c5007e577 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 */ |