From: David S. Miller <davem@davemloft.net>
Date: Fri, 10 Dec 2010 17:50:47 +0000 (-0800)
Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Tag: firefly_0821_release~7613^2~3122^2~276
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1e13f863ca88014d9550876c05c939fdab1017d1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
---

1e13f863ca88014d9550876c05c939fdab1017d1
diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index f2eec388693b,872b1a3b21c6..73a8014cacb2
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@@ -60,8 -62,6 +62,7 @@@
  static int ar9003_hw_power_interpolate(int32_t x,
  				       int32_t *px, int32_t *py, u_int16_t np);
  
- #define CTL(_tpower, _flag) ((_tpower) | ((_flag) << 6))
 +
  static const struct ar9300_eeprom ar9300_default = {
  	.eepromVersion = 2,
  	.templateVersion = 2,