1 files changed, 30 insertions, 7 deletions

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 624e8808a517..8a5c3e71b37d 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_SAA7134
         tristate "Philips SAA7134 support"
-        depends on VIDEO_DEV && PCI && I2C && SOUND
+        depends on VIDEO_DEV && PCI && I2C
         select VIDEO_BUF
         select VIDEO_IR
         select VIDEO_TUNER
@@ -12,6 +12,29 @@ config VIDEO_SAA7134
           To compile this driver as a module, choose M here: the
           module will be called saa7134.
 
+config VIDEO_SAA7134_ALSA
+        tristate "Philips SAA7134 DMA audio support"
+        depends on VIDEO_SAA7134 && SND
+        select SND_PCM_OSS
+        ---help---
+          This is a video4linux driver for direct (DMA) audio in
+          Philips SAA713x based TV cards using 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
@@ -41,8 +64,8 @@ config VIDEO_SAA7134_DVB_ALL_FRONTENDS
           If you are unsure, choose Y.
 
 config VIDEO_SAA7134_DVB_MT352
-        tristate "Zarlink MT352 DVB-T Support"
-        default m
+        bool "Zarlink MT352 DVB-T Support"
+        default y
         depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
         select DVB_MT352
         ---help---
@@ -50,8 +73,8 @@ config VIDEO_SAA7134_DVB_MT352
           Philips saa7134 chip and the MT352 demodulator.
 
 config VIDEO_SAA7134_DVB_TDA1004X
-        tristate "Phillips TDA10045H/TDA10046H DVB-T Support"
-        default m
+        bool "Phillips TDA10045H/TDA10046H DVB-T Support"
+        default y
         depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
         select DVB_TDA1004X
         ---help---
@@ -59,8 +82,8 @@ config VIDEO_SAA7134_DVB_TDA1004X
           Philips saa7134 chip and the TDA10045H/TDA10046H demodulator.
 
 config VIDEO_SAA7134_DVB_NXT200X
-        tristate "NXT2002/NXT2004 ATSC Support"
-        default m
+        bool "NXT2002/NXT2004 ATSC Support"
+        default y
         depends on VIDEO_SAA7134_DVB && !VIDEO_SAA7134_DVB_ALL_FRONTENDS
         select DVB_NXT200X
         ---help---