diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/wireless/ath9k/main.c | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath9k/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index f473fee72a2e..a9715f5b0af6 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
| @@ -1370,6 +1370,7 @@ static int ath_init(u16 devid, struct ath_softc *sc) | |||
| 1370 | 1370 | ||
| 1371 | spin_lock_init(&sc->wiphy_lock); | 1371 | spin_lock_init(&sc->wiphy_lock); |
| 1372 | spin_lock_init(&sc->sc_resetlock); | 1372 | spin_lock_init(&sc->sc_resetlock); |
| 1373 | spin_lock_init(&sc->sc_serial_rw); | ||
| 1373 | mutex_init(&sc->mutex); | 1374 | mutex_init(&sc->mutex); |
| 1374 | tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc); | 1375 | tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc); |
| 1375 | tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet, | 1376 | tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet, |