Patch "ath9k: Add debugfs support for mac/baseband samples" uses "&sc->debug.samp_lock" which breaks non-ATH9K_DEBUGFS builds. Place the correct ifdef guard around it. Signed-off-by: Paul Stewart <pstew@xxxxxxxxxxxx> Cc: Rajkumar Manoharan <rmanohar@xxxxxxxxxxxxxxxx> Cc: Adrian Chadd <adrian@xxxxxxxxxxx> --- drivers/net/wireless/ath/ath9k/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 74c9c99..b99ab96 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -553,7 +553,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, spin_lock_init(&sc->wiphy_lock); spin_lock_init(&sc->sc_serial_rw); spin_lock_init(&sc->sc_pm_lock); +#ifdef CONFIG_ATH9K_DEBUGFS spin_lock_init(&sc->debug.samp_lock); +#endif mutex_init(&sc->mutex); tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc); tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet, -- 1.7.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
