Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[pandora-kernel.git] / drivers / media / video / cx23885 / Kconfig

diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index ca5fbce..5cfb46b 100644 (file)
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -1,6 +1,7 @@
 config VIDEO_CX23885
        tristate "Conexant cx23885 (2388x successor) support"
        depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
+       depends on HOTPLUG      # due to FW_LOADER
        select I2C_ALGOBIT
        select FW_LOADER
        select VIDEO_BTCX
@@ -8,15 +9,18 @@ config VIDEO_CX23885
        select VIDEO_TVEEPROM
        select VIDEO_IR
        select VIDEOBUF_DVB
+       select VIDEOBUF_DMA_SG
        select VIDEO_CX25840
-       select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE
+       select VIDEO_CX2341X
+       select DVB_DIB7000P if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_MT2131 if !DVB_FE_CUSTOMISE
        select DVB_S5H1409 if !DVB_FE_CUSTOMISE
+       select DVB_S5H1411 if !DVB_FE_CUSTOMISE
        select DVB_LGDT330X if !DVB_FE_CUSTOMISE
-       select DVB_PLL if !DVB_FE_CUSTOMISE
-       select TUNER_XC2028 if !DVB_FE_CUSTOMIZE
-       select TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
-       select DVB_TDA18271 if !DVB_FE_CUSTOMIZE
-       select DVB_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
+       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
        select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
        ---help---
          This is a video4linux driver for Conexant 23885 based