Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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 8a5c3e7..f554316 100644 (file)
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -15,7 +15,7 @@ config VIDEO_SAA7134
 config VIDEO_SAA7134_ALSA
        tristate "Philips SAA7134 DMA audio support"
        depends on VIDEO_SAA7134 && SND
-       select SND_PCM_OSS
+       select SND_PCM
        ---help---
          This is a video4linux driver for direct (DMA) audio in
          Philips SAA713x based TV cards using ALSA
@@ -39,6 +39,8 @@ config VIDEO_SAA7134_DVB
        tristate "DVB/ATSC Support for saa7134 based TV cards"
        depends on VIDEO_SAA7134 && DVB_CORE
        select VIDEO_BUF_DVB
+       select FW_LOADER
+       select DVB_PLL
        ---help---
          This adds support for DVB cards based on the
          Philips saa7134 chip.