leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB: tm6000: Allow tm6000 driver compilation

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2010-02-08 08:44:26 -02:00
parent caa0d36cc7
commit 591a0d35a8
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/Kconfig
View File

@ -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"

1
drivers/staging/Makefile
View File

@ -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/

3
drivers/staging/tm6000/Makefile
View File

@ -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

1
drivers/staging/tm6000/tm6000-core.c
View File

@ -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>

7
drivers/staging/tm6000/tm6000-dvb.c
View File

@ -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,