Merge branch 'x86/espfix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip...

[cascardo/linux.git] / drivers / staging / vt6656 / card.c

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 9313730..d662e54 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -57,7 +57,7 @@
 #include "rc4.h"
 #include "country.h"
 #include "datarate.h"
-#include "control.h"
+#include "usbpipe.h"
 
 //const u16 cwRXBCNTSFOff[MAX_RATE] =
 //{17, 34, 96, 192, 34, 23, 17, 11, 8, 5, 4, 3};
@@ -99,15 +99,15 @@ void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel)
 
        if (priv->byBBType == BB_TYPE_11A) {
                priv->byCurPwr = 0xff;
-               RFbRawSetPower(priv,
+               vnt_rf_set_txpower(priv,
                        priv->abyOFDMAPwrTbl[connection_channel-15], RATE_54M);
        } else if (priv->byBBType == BB_TYPE_11G) {
                priv->byCurPwr = 0xff;
-               RFbRawSetPower(priv,
+               vnt_rf_set_txpower(priv,
                        priv->abyOFDMPwrTbl[connection_channel-1], RATE_54M);
        } else {
                priv->byCurPwr = 0xff;
-               RFbRawSetPower(priv,
+               vnt_rf_set_txpower(priv,
                        priv->abyCCKPwrTbl[connection_channel-1], RATE_1M);
        }
 
@@ -197,7 +197,7 @@ static u16 swGetOFDMControlRate(struct vnt_private *priv, u16 rate_idx)
  * Return Value: none
  *
  */
-void CARDvCalculateOFDMRParameter(u16 rate, u8 bb_type,
+static void CARDvCalculateOFDMRParameter(u16 rate, u8 bb_type,
                                        u8 *tx_rate, u8 *rsv_time)
 {