From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Mon, 26 May 2014 12:59:07 +0000 (+0100)
Subject: staging: vt6656: dead code remove control.c/h
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~36^2~177
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62c8526d60181da14fa73a43ed23f3314523b4f5;p=pandora-kernel.git

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 e39d2492f24f..b5ec483f3eb4 100644
--- 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 4cdea2cfdd29..d96308f00d22 100644
--- 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[] = {
Reading git-diff-tree failed