Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / ath / carl9170 / phy.h

diff --git a/drivers/net/wireless/ath/carl9170/phy.h b/drivers/net/wireless/ath/carl9170/phy.h
index 02c34eb4ebdec5fe64eb0730e24e89393c8f800f..024fb42bc7877bc61eb4d7ce8e0505c6af5f5854 100644 (file)
--- a/drivers/net/wireless/ath/carl9170/phy.h
+++ b/drivers/net/wireless/ath/carl9170/phy.h
@@ -139,8 +139,8 @@
 #define                AR9170_PHY_AGC_CONTROL_NO_UPDATE_NF     0x00020000
 
 #define        AR9170_PHY_REG_CCA                      (AR9170_PHY_REG_BASE + 0x0064)
-#define                AR9170_PHY_CCA_MINCCA_PWR               0x0ff80000
-#define                AR9170_PHY_CCA_MINCCA_PWR_S             19
+#define                AR9170_PHY_CCA_MIN_PWR                  0x0ff80000
+#define                AR9170_PHY_CCA_MIN_PWR_S                19
 #define                AR9170_PHY_CCA_THRESH62                 0x0007f000
 #define                AR9170_PHY_CCA_THRESH62_S               12
 
@@ -338,8 +338,8 @@
 #define                AR9170_PHY_EXT_CCA_CYCPWR_THR1_S        9
 #define                AR9170_PHY_EXT_CCA_THRESH62             0x007f0000
 #define                AR9170_PHY_EXT_CCA_THRESH62_S           16
-#define                AR9170_PHY_EXT_MINCCA_PWR               0xff800000
-#define                AR9170_PHY_EXT_MINCCA_PWR_S             23
+#define                AR9170_PHY_EXT_CCA_MIN_PWR              0xff800000
+#define                AR9170_PHY_EXT_CCA_MIN_PWR_S            23
 
 #define        AR9170_PHY_REG_SFCORR_EXT               (AR9170_PHY_REG_BASE + 0x01c0)
 #define                AR9170_PHY_SFCORR_EXT_M1_THRESH         0x0000007f
@@ -546,19 +546,19 @@
 #define                AR9170_PHY_FORCE_XPA_CFG_S              0
 
 #define        AR9170_PHY_REG_CH1_CCA                  (AR9170_PHY_REG_BASE + 0x1064)
-#define                AR9170_PHY_CH1_MINCCA_PWR               0x0ff80000
-#define                AR9170_PHY_CH1_MINCCA_PWR_S             19
+#define                AR9170_PHY_CH1_CCA_MIN_PWR              0x0ff80000
+#define                AR9170_PHY_CH1_CCA_MIN_PWR_S            19
 
 #define        AR9170_PHY_REG_CH2_CCA                  (AR9170_PHY_REG_BASE + 0x2064)
-#define                AR9170_PHY_CH2_MINCCA_PWR               0x0ff80000
-#define                AR9170_PHY_CH2_MINCCA_PWR_S             19
+#define                AR9170_PHY_CH2_CCA_MIN_PWR              0x0ff80000
+#define                AR9170_PHY_CH2_CCA_MIN_PWR_S            19
 
 #define        AR9170_PHY_REG_CH1_EXT_CCA              (AR9170_PHY_REG_BASE + 0x11bc)
-#define                AR9170_PHY_CH1_EXT_MINCCA_PWR           0xff800000
-#define                AR9170_PHY_CH1_EXT_MINCCA_PWR_S         23
+#define                AR9170_PHY_CH1_EXT_CCA_MIN_PWR          0xff800000
+#define                AR9170_PHY_CH1_EXT_CCA_MIN_PWR_S        23
 
 #define        AR9170_PHY_REG_CH2_EXT_CCA              (AR9170_PHY_REG_BASE + 0x21bc)
-#define                AR9170_PHY_CH2_EXT_MINCCA_PWR           0xff800000
-#define                AR9170_PHY_CH2_EXT_MINCCA_PWR_S         23
+#define                AR9170_PHY_CH2_EXT_CCA_MIN_PWR          0xff800000
+#define                AR9170_PHY_CH2_EXT_CCA_MIN_PWR_S        23
 
 #endif /* __CARL9170_SHARED_PHY_H */