diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:55:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 19:32:19 -0400 |
| commit | e00cf3b9eb7839b952e434a75bff6b99e47337ac (patch) | |
| tree | ef583ab8ac09bf703026650d4bc7777e6a3864d3 /drivers/net/wireless/ath/ath5k | |
| parent | 1a8218e96271790a07dd7065a2ef173e0f67e328 (diff) | |
| parent | 3b8ab88acaceb505aa06ef3bbf3a73b92470ae78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h
Diffstat (limited to 'drivers/net/wireless/ath/ath5k')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 203243bacc89..22047628ccfa 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
| @@ -2394,7 +2394,7 @@ ath5k_init_softc(struct ath5k_softc *sc, const struct ath_bus_ops *bus_ops) | |||
| 2394 | spin_lock_init(&sc->rxbuflock); | 2394 | spin_lock_init(&sc->rxbuflock); |
| 2395 | spin_lock_init(&sc->txbuflock); | 2395 | spin_lock_init(&sc->txbuflock); |
| 2396 | spin_lock_init(&sc->block); | 2396 | spin_lock_init(&sc->block); |
| 2397 | 2397 | spin_lock_init(&sc->irqlock); | |
| 2398 | 2398 | ||
| 2399 | /* Setup interrupt handler */ | 2399 | /* Setup interrupt handler */ |
| 2400 | ret = request_irq(sc->irq, ath5k_intr, IRQF_SHARED, "ath", sc); | 2400 | ret = request_irq(sc->irq, ath5k_intr, IRQF_SHARED, "ath", sc); |