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

[~andy/linux] / drivers / net / wireless / ath / ath5k / rfgain.h

diff --git a/drivers/net/wireless/ath/ath5k/rfgain.h b/drivers/net/wireless/ath/ath5k/rfgain.h
index 1354d8c392c814f14c72d1b4e8b1f202b2d366a0..ebfae052d89e2ddaacc1163ba6e4250d5b142f1b 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/rfgain.h
+++ b/drivers/net/wireless/ath/ath5k/rfgain.h
@@ -30,7 +30,7 @@ struct ath5k_ini_rfgain {
 
 /* Initial RF Gain settings for RF5111 */
 static const struct ath5k_ini_rfgain rfgain_5111[] = {
-       /*                            5Ghz      2Ghz    */
+       /*                            5GHz      2GHz    */
        { AR5K_RF_GAIN(0),      { 0x000001a9, 0x00000000 } },
        { AR5K_RF_GAIN(1),      { 0x000001e9, 0x00000040 } },
        { AR5K_RF_GAIN(2),      { 0x00000029, 0x00000080 } },
@@ -99,7 +99,7 @@ static const struct ath5k_ini_rfgain rfgain_5111[] = {
 
 /* Initial RF Gain settings for RF5112 */
 static const struct ath5k_ini_rfgain rfgain_5112[] = {
-       /*                            5Ghz      2Ghz    */
+       /*                            5GHz      2GHz    */
        { AR5K_RF_GAIN(0),      { 0x00000007, 0x00000007 } },
        { AR5K_RF_GAIN(1),      { 0x00000047, 0x00000047 } },
        { AR5K_RF_GAIN(2),      { 0x00000087, 0x00000087 } },
@@ -305,7 +305,7 @@ static const struct ath5k_ini_rfgain rfgain_2316[] = {
 
 /* Initial RF Gain settings for RF5413 */
 static const struct ath5k_ini_rfgain rfgain_5413[] = {
-       /*                            5Ghz      2Ghz    */
+       /*                            5GHz      2GHz    */
        { AR5K_RF_GAIN(0),      { 0x00000000, 0x00000000 } },
        { AR5K_RF_GAIN(1),      { 0x00000040, 0x00000040 } },
        { AR5K_RF_GAIN(2),      { 0x00000080, 0x00000080 } },
@@ -452,7 +452,7 @@ static const struct ath5k_ini_rfgain rfgain_2425[] = {
 
 /* Check if our current measurement is inside our
  * current variable attenuation window */
-#define AR5K_GAIN_CHECK_ADJUST(_g)             \
+#define AR5K_GAIN_CHECK_ADJUST(_g)             \
        ((_g)->g_current <= (_g)->g_low || (_g)->g_current >= (_g)->g_high)
 
 struct ath5k_gain_opt_step {