V4L/DVB: tm6000: Allow tm6000 driver compilation

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 7696a664f8a554dd60c720e15054bf4188b64bfb..5589616082e723eb1284c206c28bebb5b97452c7 100644 (file)
--- 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 ea2e70e2fed466f49a082164c0177ba054b8af98..ec45d4bb8c114ac2d645f3207cb84fb7eb9e9a54 100644 (file)
--- 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 25aefe74dddc832425f90483897f8e610c4294e0..f904d5779c81d8252d4e6567c02f629d4d2dff29 100644 (file)
--- 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 7ec13d52d810bc5d145d538f59e0e013104b7387..bc9ec2c9e2022724cb14521dde4b26390245bc2e 100644 (file)
--- 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 97bc2d14878e583850351081d9a6329e94d25aaa..e16d55efb4f29c7e118d26aced9938d2c6df298e 100644 (file)
--- 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,