Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

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

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index f2eec38,872b1a3..73a8014
--- 1/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
--- 2/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,