diff --git a/[refs] b/[refs] index d5660b9d0013..d00b507ed466 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65fdbb48eb43e33e94239677a75422ddc6f5eb75 +refs/heads/master: 6c5379077f47f6eff9c23caf8513751d2f582e72 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c index c7ebb3bf06f5..3ccb84aa5dbc 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.c +++ b/trunk/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); }