staging: vt6656: dead code remove control.c/h

Replace control.h headers with usbpipe.h

Also add to usbpipe.c its header

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index e39d249..b5ec483 100644 (file)
--- a/drivers/staging/vt6656/Makefile
+++ b/drivers/staging/vt6656/Makefile
@@ -27,7 +27,6 @@ vt6656_stage-y +=     main_usb.o \
                        wpactl.o \
                        usbpipe.o \
                        channel.o \
-                       control.o \
                        firmware.o \
                        int.o
 

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 4cdea2c..d96308f 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[] = {

diff --cc drivers/staging/vt6656/bssdb.c
Simple merge

diff --cc drivers/staging/vt6656/card.c
Simple merge

diff --cc drivers/staging/vt6656/control.c
Simple merge

diff --cc drivers/staging/vt6656/control.h
Simple merge

diff --cc drivers/staging/vt6656/firmware.c
Simple merge

diff --cc drivers/staging/vt6656/iwctl.c
Simple merge

diff --cc drivers/staging/vt6656/key.c
Simple merge

diff --cc drivers/staging/vt6656/mac.c
Simple merge

diff --cc drivers/staging/vt6656/main_usb.c
Simple merge

diff --cc drivers/staging/vt6656/power.c
Simple merge

diff --cc drivers/staging/vt6656/rf.c
Simple merge

diff --cc drivers/staging/vt6656/usbpipe.c
Simple merge

diff --cc drivers/staging/vt6656/wcmd.c
Simple merge

diff --cc drivers/staging/vt6656/wmgr.c
Simple merge

diff --cc drivers/staging/vt6656/wpactl.c
Simple merge