diff --git a/[refs] b/[refs]
index efb36ea56ebd..3a36c6712f8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fbab5163aa8cb3a5aef845fbf67b0c1c85030b6
+refs/heads/master: 81cd110d818dd4649cbac17f95f698a24c7acc45
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
index a71c32a649d9..f0371ad0a37f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-hw.h
@@ -1036,13 +1036,6 @@ union iwl4965_tx_power_dual_stream {
 #define R_MCS_36M_DUAL_MSK 0x400
 #define R_MCS_48M_DUAL_MSK 0x800
 
-#define is_legacy(tbl) (((tbl) == LQ_G) || ((tbl) == LQ_A))
-#define is_siso(tbl) (((tbl) == LQ_SISO))
-#define is_mimo(tbl) (((tbl) == LQ_MIMO))
-#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))
-#define is_a_band(tbl) (((tbl) == LQ_A))
-#define is_g_and(tbl) (((tbl) == LQ_G))
-
 /* Flow Handler Definitions */
 
 /**********************/
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.h b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
index 0c9552b26c40..31e21e29bbad 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-rs.h
@@ -223,6 +223,13 @@ enum iwl4965_table_type {
 	LQ_MAX,
 };
 
+#define is_legacy(tbl) (((tbl) == LQ_G) || ((tbl) == LQ_A))
+#define is_siso(tbl) (((tbl) == LQ_SISO))
+#define is_mimo(tbl) (((tbl) == LQ_MIMO))
+#define is_Ht(tbl) (is_siso(tbl) || is_mimo(tbl))
+#define is_a_band(tbl) (((tbl) == LQ_A))
+#define is_g_and(tbl) (((tbl) == LQ_G))
+
 /* 4965 has 2 antennas/chains for Tx (but 3 for Rx) */
 enum iwl4965_antenna_type {
 	ANT_NONE,