Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7134 / Kconfig

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 40e4c3bd2cb9b39a6b764793f3286801454e508c..83f076abce35193acf230ec73bcdd9fb87807c6c 100644 (file)
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -3,7 +3,7 @@ config VIDEO_SAA7134
        depends on VIDEO_DEV && PCI && I2C && INPUT
        select VIDEOBUF_DMA_SG
        select VIDEO_IR
-       select MEDIA_TUNER
+       select VIDEO_TUNER
        select VIDEO_TVEEPROM
        select CRC32
        ---help---
@@ -27,6 +27,7 @@ config VIDEO_SAA7134_ALSA
 config VIDEO_SAA7134_DVB
        tristate "DVB/ATSC Support for saa7134 based TV cards"
        depends on VIDEO_SAA7134 && DVB_CORE
+       depends on HOTPLUG      # due to FW_LOADER
        select VIDEOBUF_DVB
        select FW_LOADER
        select DVB_PLL if !DVB_FE_CUSTOMISE