Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / media / video / cx231xx / Kconfig

diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
index 5ac7eceececa49002126ab0aa73aa09776c6e348..ae85a7a7bd73814c81b578761b522e7ddda9c8bf 100644 (file)
--- a/drivers/media/video/cx231xx/Kconfig
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -1,11 +1,12 @@
 config VIDEO_CX231XX
        tristate "Conexant cx231xx USB video capture support"
-       depends on VIDEO_DEV && I2C && INPUT
+       depends on VIDEO_DEV && I2C
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
-       depends on VIDEO_IR
+       depends on RC_CORE
        select VIDEOBUF_VMALLOC
        select VIDEO_CX25840
+       select VIDEO_CX2341X
 
        ---help---
          This is a video4linux driver for Conexant 231xx USB based TV cards.
@@ -13,6 +14,19 @@ config VIDEO_CX231XX
          To compile this driver as a module, choose M here: the
          module will be called cx231xx
 
+config VIDEO_CX231XX_RC
+       bool "Conexant cx231xx Remote Controller additional support"
+       depends on RC_CORE
+       depends on VIDEO_CX231XX
+       default y
+       ---help---
+         cx231xx hardware has a builtin RX/TX support. However, a few
+         designs opted to not use it, but, instead, some other hardware.
+         This module enables the usage of those other hardware, like the
+         ones used with ISDB-T boards.
+
+         On most cases, all you need for IR is mceusb module.
+
 config VIDEO_CX231XX_ALSA
        tristate "Conexant Cx231xx ALSA audio module"
        depends on VIDEO_CX231XX && SND
@@ -29,6 +43,8 @@ config VIDEO_CX231XX_DVB
        depends on VIDEO_CX231XX && DVB_CORE
        select VIDEOBUF_DVB
        select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_NXP18271 if !DVB_FE_CUSTOMISE
+       select DVB_MB86A20S if !DVB_FE_CUSTOMISE
 
        ---help---
          This adds support for DVB cards based on the