From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 27 Oct 2014 18:09:36 +0000 (-0400)
Subject: Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=490f0dc4d52a01904cead9dd2fa57956ca737eb7;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath

Conflicts:
	drivers/net/wireless/ath/wil6210/wil6210.h
---

490f0dc4d52a01904cead9dd2fa57956ca737eb7
diff --cc drivers/net/wireless/ath/wil6210/wil6210.h
index ce6488e42091,1300b5505151..7ffaf2fce097
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@@ -461,10 -435,12 +461,13 @@@ struct wil6210_priv 
  #define wdev_to_wil(w) (struct wil6210_priv *)(wdev_priv(w))
  #define wil_to_ndev(i) (wil_to_wdev(i)->netdev)
  #define ndev_to_wil(n) (wdev_to_wil(n->ieee80211_ptr))
 +#define wil_to_pcie_dev(i) (&i->pdev->dev)
  
+ __printf(2, 3)
 -int wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
 +void wil_dbg_trace(struct wil6210_priv *wil, const char *fmt, ...);
+ __printf(2, 3)
  void wil_err(struct wil6210_priv *wil, const char *fmt, ...);
+ __printf(2, 3)
  void wil_info(struct wil6210_priv *wil, const char *fmt, ...);
  #define wil_dbg(wil, fmt, arg...) do { \
  	netdev_dbg(wil_to_ndev(wil), fmt, ##arg); \