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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-4965-rs.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index
c7ebb3b
..
3ccb84a
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@
-2265,9
+2265,7
@@
static void rs_rate_init(void *priv_rate, void *priv_sta,
/* as default allow aggregation for all tids */
lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
-#ifdef CONFIG_MAC80211_DEBUGFS
lq_sta->drv = priv;
-#endif
rs_initialize_lq(priv, conf, sta);
}