Skip to content

Commit

Permalink
Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/iwlwifi/iwlwifi-2.6
  • Loading branch information
John W. Linville committed Feb 25, 2011
2 parents 0bf719d + 41504cc commit 79ae79c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-5000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 79ae79c

Please sign in to comment.