Merge branch 'for-linville' of git://github.com/kvalo/ath6kl

git-mirror · Apr 12, 2012 · c2786e4 · c2786e4
2 parents 8065248 + d97c121
commit c2786e4
Show file tree

Hide file tree

Showing 20 changed files with 3,370 additions and 165 deletions.
diff --git a/drivers/net/wireless/ath/ath6kl/Makefile b/drivers/net/wireless/ath/ath6kl/Makefile
@@ -25,7 +25,8 @@
 obj-$(CONFIG_ATH6KL) += ath6kl_core.o
 ath6kl_core-y += debug.o
 ath6kl_core-y += hif.o
-ath6kl_core-y += htc.o
+ath6kl_core-y += htc_mbox.o
+ath6kl_core-y += htc_pipe.o
 ath6kl_core-y += bmi.o
 ath6kl_core-y += cfg80211.o
 ath6kl_core-y += init.o