From 6f31257de1526714142f3dcf37d97d56f47627db Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Sun, 13 Sep 2009 23:55:05 -0700
Subject: [PATCH] --- yaml --- r: 170541 b: refs/heads/master c:
 990b70ab24cbce585a3436c8c88cb48b888d48b4 h: refs/heads/master i:   170539:
 658a0e4a951dbc3f5570eeef3237c9db9e46a1c5 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/Makefile | 7 +++----
 trunk/drivers/net/wireless/ath/ath9k/ath9k.h  | 1 -
 trunk/drivers/net/wireless/ath/ath9k/hw.h     | 2 ++
 trunk/drivers/net/wireless/ath/ath9k/mac.c    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 661d5a946db6..930683a21dfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfe8cba982cda73d4970dab712411bebdcc3b9cd
+refs/heads/master: 990b70ab24cbce585a3436c8c88cb48b888d48b4
diff --git a/trunk/drivers/net/wireless/ath/ath9k/Makefile b/trunk/drivers/net/wireless/ath/ath9k/Makefile
index f85dc8235774..2f21c67d86c8 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/Makefile
+++ b/trunk/drivers/net/wireless/ath/ath9k/Makefile
@@ -1,6 +1,4 @@
-ATH9K_HW_FIX +=	eeprom.o \
-		mac.o \
-
+ATH9K_HW_FIX +=	eeprom.o
 ATH9K_HW +=	hw.o \
 		eeprom_def.o \
 		eeprom_4k.o \
@@ -8,7 +6,8 @@ ATH9K_HW +=	hw.o \
 		calib.o \
 		ani.o \
 		phy.o \
-		btcoex.o
+		btcoex.o \
+		mac.o \
 
 ath9k-y +=	$(ATH9K_HW) \
 		$(ATH9K_HW_FIX) \
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
index 9aff11da3796..8768e603eb72 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -288,7 +288,6 @@ struct ath_tx_control {
 
 #define ATH_RSSI_LPF_LEN 		10
 #define RSSI_LPF_THRESHOLD		-20
-#define ATH9K_RSSI_BAD			0x80
 #define ATH_RSSI_EP_MULTIPLIER     (1<<7)
 #define ATH_EP_MUL(x, mul)         ((x) * (mul))
 #define ATH_RSSI_IN(x)             (ATH_EP_MUL((x), ATH_RSSI_EP_MULTIPLIER))
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.h b/trunk/drivers/net/wireless/ath/ath9k/hw.h
index 874fb11cbac2..d854c17b8688 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.h
@@ -55,6 +55,8 @@
 
 #define	ATH_DEFAULT_NOISE_FLOOR -95
 
+#define ATH9K_RSSI_BAD			0x80
+
 /* Register read/write primitives */
 #define REG_WRITE(_ah, _reg, _val) \
 	ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg))
diff --git a/trunk/drivers/net/wireless/ath/ath9k/mac.c b/trunk/drivers/net/wireless/ath/ath9k/mac.c
index 1796ac773f91..3be658d42a53 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/mac.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/mac.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "ath9k.h"
+#include "hw.h"
 
 static void ath9k_hw_set_txq_interrupts(struct ath_hw *ah,
 					struct ath9k_tx_queue_info *qi)