Hi John, here's just one patch to fix the linker error Stephen found. The following changes since commit 392e741939ddb7dd7adf7e4ec414b2140fb3a15b: Merge branch 'for-linville' of master.kernel.org:/pub/scm/linux/kernel/git/kvalo/ath6kl (2011-08-09 16:02:26 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git for-linville Kalle Valo (1): ath6kl: fix function name conflicts with ath9k drivers/net/wireless/ath/ath6kl/htc.c | 61 +++++++++++++++-------------- drivers/net/wireless/ath/ath6kl/htc.h | 45 +++++++++++---------- drivers/net/wireless/ath/ath6kl/htc_hif.c | 4 +- drivers/net/wireless/ath/ath6kl/init.c | 16 ++++---- drivers/net/wireless/ath/ath6kl/main.c | 4 +- drivers/net/wireless/ath/ath6kl/txrx.c | 14 +++--- 6 files changed, 74 insertions(+), 70 deletions(-) -- 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