git.openpandora.org
/
pandora-kernel.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/linville/wirel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-1000.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-1000.c
b/drivers/net/wireless/iwlwifi/iwl-1000.c
index
ba78bc8
..
27c5007
100644
(file)
--- 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 */
#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 */
#define IWL100_UCODE_API_MAX 5
/* Lowest firmware API version supported */
@@
-232,8
+232,6
@@
static struct iwl_lib_ops iwl1000_lib = {
.bt_stats_read = iwl_ucode_bt_stats_read,
.reply_tx_error = iwl_reply_tx_error_read,
},
.bt_stats_read = iwl_ucode_bt_stats_read,
.reply_tx_error = iwl_reply_tx_error_read,
},
- .check_plcp_health = iwl_good_plcp_health,
- .check_ack_health = iwl_good_ack_health,
.txfifo_flush = iwlagn_txfifo_flush,
.dev_txfifo_flush = iwlagn_dev_txfifo_flush,
.tt_ops = {
.txfifo_flush = iwlagn_txfifo_flush,
.dev_txfifo_flush = iwlagn_dev_txfifo_flush,
.tt_ops = {