diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-29 23:30:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-29 23:30:35 -0400 |
| commit | aba7453037c3a90714caae77a622dceaf1173786 (patch) | |
| tree | bf07f9f432b0d8e9db9486f1f32ad065c0aa7c5c /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | a4fe91ee711f4e955ea85ab05b092cfe384b073e (diff) | |
| parent | 93af7aca44f0e82e67bda10a0fb73d383edcc8bd (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/isdn/00-INDEX
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/main.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 84feeb70fea4..a782292ed435 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -1412,7 +1412,6 @@ void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq) | |||
| 1412 | rxq->free_count = 0; | 1412 | rxq->free_count = 0; |
| 1413 | spin_unlock_irqrestore(&rxq->lock, flags); | 1413 | spin_unlock_irqrestore(&rxq->lock, flags); |
| 1414 | } | 1414 | } |
| 1415 | EXPORT_SYMBOL(iwl3945_rx_queue_reset); | ||
| 1416 | 1415 | ||
| 1417 | /* | 1416 | /* |
| 1418 | * this should be called while priv->lock is locked | 1417 | * this should be called while priv->lock is locked |