From 98d0c4c6d061a5a64f34177ee9fa80a8381ebc91 Mon Sep 17 00:00:00 2001 From: Stefan Ringel Date: Mon, 28 Nov 2011 15:46:16 -0300 Subject: [PATCH] --- yaml --- r: 285325 b: refs/heads/master c: 078a68c11fe0580a23754fac25a6d9896719278e h: refs/heads/master i: 285323: fa47466ddf2ff48a5bc9fe0297d5baa93953e099 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tm6000/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74e3f09480c6..9b7ff5d8caed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32f6f3ac5468bbbe0263d29daa16f38d04c2274f +refs/heads/master: 078a68c11fe0580a23754fac25a6d9896719278e diff --git a/trunk/drivers/media/video/tm6000/Kconfig b/trunk/drivers/media/video/tm6000/Kconfig index 114eec8a630a..a43b77abd931 100644 --- a/trunk/drivers/media/video/tm6000/Kconfig +++ b/trunk/drivers/media/video/tm6000/Kconfig @@ -1,6 +1,6 @@ config VIDEO_TM6000 tristate "TV Master TM5600/6000/6010 driver" - depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB && EXPERIMENTAL + depends on VIDEO_DEV && I2C && INPUT && RC_CORE && USB select VIDEO_TUNER select MEDIA_TUNER_XC2028 select MEDIA_TUNER_XC5000 @@ -16,7 +16,7 @@ config VIDEO_TM6000 config VIDEO_TM6000_ALSA tristate "TV Master TM5600/6000/6010 audio support" - depends on VIDEO_TM6000 && SND && EXPERIMENTAL + depends on VIDEO_TM6000 && SND select SND_PCM ---help--- This is a video4linux driver for direct (DMA) audio for @@ -27,7 +27,7 @@ config VIDEO_TM6000_ALSA config VIDEO_TM6000_DVB tristate "DVB Support for tm6000 based TV cards" - depends on VIDEO_TM6000 && DVB_CORE && USB && EXPERIMENTAL + depends on VIDEO_TM6000 && DVB_CORE && USB select DVB_ZL10353 ---help--- This adds support for DVB cards based on the tm5600/tm6000 chip.