Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

[linux-2.6] / drivers / media / video / ivtv / Kconfig

diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 270906fc314600107e161dde9575308c85385f1e..5d7ee8fcdd50b3fd4b788ed0a48078a64e68d9ec 100644 (file)
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -1,6 +1,8 @@
 config VIDEO_IVTV
        tristate "Conexant cx23416/cx23415 MPEG encoder/decoder support"
        depends on VIDEO_V4L1 && VIDEO_V4L2 && PCI && I2C && EXPERIMENTAL
+       depends on INPUT   # due to VIDEO_IR
+       depends on HOTPLUG # due to FW_LOADER
        select I2C_ALGOBIT
        select FW_LOADER
        select VIDEO_IR
@@ -10,6 +12,7 @@ config VIDEO_IVTV
        select VIDEO_CX25840
        select VIDEO_MSP3400
        select VIDEO_SAA711X
+       select VIDEO_SAA717X
        select VIDEO_SAA7127
        select VIDEO_TVAUDIO
        select VIDEO_CS53L32A