Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192727
b: refs/heads/master
c: 591a0d3
h: refs/heads/master
i:
  192725: 9a64d99
  192723: 83095b7
  192719: 975708d
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed May 18, 2010
1 parent 93eb78b commit c08c38b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: caa0d36cc7c5674c9b8dfab060ea6c36c2a8e62f
refs/heads/master: 591a0d35a8e9bad1ae2481502ba3b7facb4a0dac
2 changes: 2 additions & 0 deletions trunk/drivers/staging/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/staging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/staging/tm6000/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 0 additions & 1 deletion trunk/drivers/staging/tm6000/tm6000-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions trunk/drivers/staging/tm6000/tm6000-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#include <linux/kernel.h>
#include <linux/usb.h>
#include <compat.h>

#include "tm6000.h"
#include "tm6000-regs.h"
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c08c38b

Please sign in to comment.