Merge tag 'for-linus-3.16-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / staging / vt6656 / baseband.c

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 4cdea2cfdd2964e039de7edd82d4dfdcaa9c2b40..694e34a5ff9048f135e2304198e75a9ffe4f06f8 100644 (file)
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -40,7 +40,7 @@
 #include "mac.h"
 #include "baseband.h"
 #include "rf.h"
-#include "control.h"
+#include "usbpipe.h"
 #include "datarate.h"
 
 static u8 abyVT3184_AGC[] = {
@@ -1040,8 +1040,7 @@ int BBbVT3184Init(struct vnt_private *priv)
        vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x04, 0x7f);
        vnt_control_out_u8(priv, MESSAGE_REQUEST_BBREG, 0x0d, 0x01);
 
-       RFbRFTableDownload(priv);
-
+       vnt_rf_table_download(priv);
 
        /* Fix for TX USB resets from vendors driver */
        vnt_control_in(priv, MESSAGE_TYPE_READ, USB_REG4,