Commit 591a0d35 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB: tm6000: Allow tm6000 driver compilation 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent caa0d36c

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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"

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/staging/tm6000/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/tm6000/tm6000-core.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/staging/tm6000/tm6000-dvb.c

+0 −7
Original line number Diff line number Diff line
@@ -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,