From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu, 12 Apr 2012 06:45:11 +0000 (+0300)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Tag: v3.5-rc1~101^2~6^2^2~84^2~31
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d968370ee7ce22583ab741961f0044d2922aa1a1;p=karo-tx-linux.git

Merge remote branch 'wireless-next/master' into ath6kl-next
---

d968370ee7ce22583ab741961f0044d2922aa1a1
diff --cc drivers/net/wireless/ath/ath6kl/txrx.c
index 0163182e79da,521f0be990f1..82f2f5cb475b
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@@ -15,9 -15,10 +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