OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
drivers
/
net
/
wireless
/
intel
/
iwlwifi
/
iwl-7000.c
diff --git
a/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
index
fa41a5e
..
fc475ce
100644
(file)
--- a/
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
+++ b/
drivers/net/wireless/intel/iwlwifi/iwl-7000.c
@@
-73,8
+73,8
@@
/* Highest firmware API version supported */
#define IWL7260_UCODE_API_MAX 17
#define IWL7265_UCODE_API_MAX 17
/* Highest firmware API version supported */
#define IWL7260_UCODE_API_MAX 17
#define IWL7265_UCODE_API_MAX 17
-#define IWL7265D_UCODE_API_MAX 2
0
-#define IWL3168_UCODE_API_MAX 2
0
+#define IWL7265D_UCODE_API_MAX 2
1
+#define IWL3168_UCODE_API_MAX 2
1
/* Oldest version we won't warn about */
#define IWL7260_UCODE_API_OK 13
/* Oldest version we won't warn about */
#define IWL7260_UCODE_API_OK 13