Merge ../linux-2.6

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

diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 270906fc314600107e161dde9575308c85385f1e..0069898bddabffe925b540bc99ad93dd739d919a 100644 (file)
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -1,8 +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
        select I2C_ALGOBIT
-       select FW_LOADER
        select VIDEO_IR
        select VIDEO_TUNER
        select VIDEO_TVEEPROM
@@ -10,6 +10,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