V4L/DVB (7881): saa7134: fixed a compile warning in saa7134-core.c

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

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 3aa8cb2..83f076a 100644 (file)
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -4,6 +4,7 @@ config VIDEO_SAA7134
        select VIDEOBUF_DMA_SG
        select VIDEO_IR
        select VIDEO_TUNER
+       select VIDEO_TVEEPROM
        select CRC32
        ---help---
          This is a video4linux driver for Philips SAA713x based
@@ -23,21 +24,10 @@ config VIDEO_SAA7134_ALSA
          To compile this driver as a module, choose M here: the
          module will be called saa7134-alsa.
 
-config VIDEO_SAA7134_OSS
-       tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)"
-       depends on VIDEO_SAA7134 && SOUND_PRIME && !VIDEO_SAA7134_ALSA
-       ---help---
-         This is a video4linux driver for direct (DMA) audio in
-         Philips SAA713x based TV cards using OSS
-
-         This is deprecated in favor of the ALSA module
-
-         To compile this driver as a module, choose M here: the
-         module will be called saa7134-oss.
-
 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
@@ -46,8 +36,9 @@ config VIDEO_SAA7134_DVB
        select DVB_NXT200X if !DVB_FE_CUSTOMISE
        select DVB_TDA10086 if !DVB_FE_CUSTOMISE
        select DVB_TDA826X if !DVB_FE_CUSTOMISE
-       select DVB_TDA827X if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE
        select DVB_ISL6421 if !DVB_FE_CUSTOMISE
+       select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE
        ---help---
          This adds support for DVB cards based on the
          Philips saa7134 chip.