diff --git a/[refs] b/[refs]
index d107f6e99811..1bb82e21e956 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f22f558dcaaf2ca413571df0ae8219474af1a46f
+refs/heads/master: 3b95978ddadbab594aad6280bfa660a49948af86
diff --git a/trunk/drivers/net/wireless/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath9k/ath9k.h
index 9976406f6d63..82e71f9f316a 100644
--- a/trunk/drivers/net/wireless/ath9k/ath9k.h
+++ b/trunk/drivers/net/wireless/ath9k/ath9k.h
@@ -634,11 +634,6 @@ enum ath9k_power_mode {
 	ATH9K_PM_UNDEFINED
 };
 
-#define HAL_ANTENNA_MIN_MODE  0
-#define HAL_ANTENNA_FIXED_A   1
-#define HAL_ANTENNA_FIXED_B   2
-#define HAL_ANTENNA_MAX_MODE  3
-
 struct ath9k_mib_stats {
 	u32 ackrcv_bad;
 	u32 rts_bad;
@@ -696,7 +691,6 @@ enum phytype {
 	PHY_FH,
 	PHY_OFDM,
 	PHY_HT,
-	PHY_MAX
 };
 #define PHY_CCK PHY_DS