From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 12 Apr 2012 19:02:19 +0000 (-0400)
Subject: Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
X-Git-Tag: v3.5-rc1~109^2~410^2~128
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c2786e4a173f89ae81d6ba45d5bf129d77733eea;p=linux.git

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

c2786e4a173f89ae81d6ba45d5bf129d77733eea
diff --cc drivers/net/wireless/ath/ath6kl/txrx.c
index 521f0be990f1,0163182e79da..82f2f5cb475b
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@@ -15,10 -15,9 +15,11 @@@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
  #include "core.h"
  #include "debug.h"
+ #include "htc-ops.h"
  
  /*
   * tid - tid_mux0..tid_mux3