diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 2 |
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 @@ | |||
| 51 | #include "iwl-agn-debugfs.h" | 51 | #include "iwl-agn-debugfs.h" |
| 52 | 52 | ||
| 53 | /* Highest firmware API version supported */ | 53 | /* Highest firmware API version supported */ |
| 54 | #define IWL5000_UCODE_API_MAX 2 | 54 | #define IWL5000_UCODE_API_MAX 5 |
| 55 | #define IWL5150_UCODE_API_MAX 2 | 55 | #define IWL5150_UCODE_API_MAX 2 |
| 56 | 56 | ||
| 57 | /* Lowest firmware API version supported */ | 57 | /* Lowest firmware API version supported */ |