Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath9k/main.c between commit
11cb2b00a5f8654102e34df3cfa44992b9c2fc8e ("ath9k: Fix panic upon attach
failure") from the wireless-current tree and commit ath_attach ("ath9k:
move common regulatory code out of if() branches") from the wireless tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/wireless/ath9k/main.c
index 7d7537e,1b2c9af..0000000
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@@ -1566,7 -1569,8 +1570,8 @@@ bad
int ath_attach(u16 devid, struct ath_softc *sc)
{
struct ieee80211_hw *hw = sc->hw;
+ const struct ieee80211_regdomain *regd;
- int error = 0;
+ int error = 0, i;
DPRINTF(sc, ATH_DBG_CONFIG, "Attach ATH hw\n");
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
