From 591a0d35a8e9bad1ae2481502ba3b7facb4a0dac Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 8 Feb 2010 08:44:26 -0200
Subject: [PATCH] V4L/DVB: tm6000: Allow tm6000 driver compilation

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 drivers/staging/Kconfig              | 2 ++
 drivers/staging/Makefile             | 1 +
 drivers/staging/tm6000/Makefile      | 3 +++
 drivers/staging/tm6000/tm6000-core.c | 1 -
 drivers/staging/tm6000/tm6000-dvb.c  | 7 -------
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7696a664f8a5..5589616082e7 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -49,6 +49,8 @@ source "drivers/staging/go7007/Kconfig"
 
 source "drivers/staging/cx25821/Kconfig"
 
+source "drivers/staging/tm6000/Kconfig"
+
 source "drivers/staging/usbip/Kconfig"
 
 source "drivers/staging/winbond/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index ea2e70e2fed4..ec45d4bb8c11 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
 obj-$(CONFIG_VIDEO_CX25821)	+= cx25821/
+obj-$(CONFIG_VIDEO_TM6000)	+= tm6000/
 obj-$(CONFIG_USB_IP_COMMON)	+= usbip/
 obj-$(CONFIG_W35UND)		+= winbond/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
diff --git a/drivers/staging/tm6000/Makefile b/drivers/staging/tm6000/Makefile
index 25aefe74dddc..f904d5779c81 100644
--- a/drivers/staging/tm6000/Makefile
+++ b/drivers/staging/tm6000/Makefile
@@ -13,3 +13,6 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
 obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
 
 EXTRA_CFLAGS = -Idrivers/media/video
+EXTRA_CFLAGS += -Idrivers/media/common/tuners
+EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
+EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 7ec13d52d810..bc9ec2c9e202 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -24,7 +24,6 @@
 #include <linux/kernel.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
-#include <linux/video_decoder.h>
 #include "tm6000.h"
 #include "tm6000-regs.h"
 #include <media/v4l2-common.h>
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index 97bc2d14878e..e16d55efb4f2 100644
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -19,7 +19,6 @@
 
 #include <linux/kernel.h>
 #include <linux/usb.h>
-#include <compat.h>
 
 #include "tm6000.h"
 #include "tm6000-regs.h"
@@ -72,12 +71,7 @@ static void inline print_err_status (struct tm6000_core *dev,
 	}
 }
 
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static void tm6000_urb_received(struct urb *urb, struct pt_regs *ptregs)
-#else
 static void tm6000_urb_received(struct urb *urb)
-#endif
 {
 	int ret;
 	struct tm6000_core* dev = urb->context;
@@ -226,7 +220,6 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev)
 				     .parallel_ts = 1,
 				     .if2 = 45700,
 				     .disable_i2c_gate_ctrl = 1,
-				     .tm6000 = 1,
 				    };
 
 		dvb->frontend = pseudo_zl10353_attach(dev, &config,
-- 
2.30.2