Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

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

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 9f1417a..96bc3b1 100644 (file)
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -1,9 +1,10 @@
 config VIDEO_SAA7134
        tristate "Philips SAA7134 support"
-       depends on VIDEO_DEV && PCI && I2C
-       select VIDEO_BUF
+       depends on VIDEO_DEV && PCI && I2C && INPUT
+       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,22 +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
-       select VIDEO_BUF_DVB
+       select VIDEOBUF_DVB
        select FW_LOADER
        select DVB_PLL if !DVB_FE_CUSTOMISE
        select DVB_MT352 if !DVB_FE_CUSTOMISE