diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2007-08-25 08:35:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2007-08-25 08:35:31 -0300 |
| commit | 9fb9cbfe163852df2750bb8df95a6d93638aeb29 (patch) | |
| tree | 41f99ef4957d4a9b5615f497c0c103a9280c8185 /linux/drivers | |
| parent | fa832d9ab23c60145c0e688f4d8b18140b731e15 (diff) | |
| download | mediapointer-dvb-s2-9fb9cbfe163852df2750bb8df95a6d93638aeb29.tar.gz mediapointer-dvb-s2-9fb9cbfe163852df2750bb8df95a6d93638aeb29.tar.bz2 | |
tm6000: fix DVB dependency
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Compilation were causing errors, if DVB_CORE weren't selected.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/staging/tm6000/Kconfig | 6 | ||||
| -rw-r--r-- | linux/drivers/staging/tm6000/Makefile | 8 | ||||
| -rw-r--r-- | linux/drivers/staging/tm6000/tm6000-cards.c | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/linux/drivers/staging/tm6000/Kconfig b/linux/drivers/staging/tm6000/Kconfig index 841e026ec..231dda3d4 100644 --- a/linux/drivers/staging/tm6000/Kconfig +++ b/linux/drivers/staging/tm6000/Kconfig @@ -12,3 +12,9 @@ config VIDEO_TM6000 an external software decoder to watch TV on your computer. Say Y if you own such a device and want to use it. + +config VIDEO_TM6000_DVB + bool "DVB Support for tm6000 based TV cards" + depends on VIDEO_TM6000 && DVB_CORE + ---help--- + This adds support for DVB cards based on the tm5600/tm6000 chip. diff --git a/linux/drivers/staging/tm6000/Makefile b/linux/drivers/staging/tm6000/Makefile index 1fefe057d..9b0e5b5bf 100644 --- a/linux/drivers/staging/tm6000/Makefile +++ b/linux/drivers/staging/tm6000/Makefile @@ -1,10 +1,12 @@ tm6000-objs := tm6000-cards.o \ tm6000-core.o \ tm6000-i2c.o \ - tm6000-video.o \ - tm6000-dvb.o \ - hack.o \ + tm6000-video.o +ifeq ($(CONFIG_VIDEO_TM6000_DVB),y) +tm6000-objs := tm6000-dvb.o \ + hack.o +endif obj-$(CONFIG_VIDEO_TM6000) += tm6000.o diff --git a/linux/drivers/staging/tm6000/tm6000-cards.c b/linux/drivers/staging/tm6000/tm6000-cards.c index b404e2e20..9210e4060 100644 --- a/linux/drivers/staging/tm6000/tm6000-cards.c +++ b/linux/drivers/staging/tm6000/tm6000-cards.c @@ -208,12 +208,14 @@ static int tm6000_init_dev(struct tm6000_core *dev) rc = -ENOMEM; goto err; } +#ifdef CONFIG_VIDEO_TM6000_DVB rc = tm6000_dvb_register(dev); if(rc < 0) { kfree(dev->dvb); dev->dvb = NULL; goto err; } +#endif } err: mutex_unlock(&dev->lock); @@ -435,10 +437,12 @@ static void tm6000_usb_disconnect(struct usb_interface *interface) mutex_lock(&dev->lock); +#ifdef CONFIG_VIDEO_TM6000_DVB if(dev->dvb) { tm6000_dvb_unregister(dev); kfree(dev->dvb); } +#endif tm6000_v4l2_unregister(dev); |