Re: Recursive dependency for SAA7134 in 2.6.15-rc7

[Mauro Carvalho Chehab <mchehab@brturbo.com.br>]

Hi, Jean and Roman,

Em Qui, 2005-12-29 às 22:07 +0100, Jean Delvare escreveu:
> Hi Roman,
> 
> > On Thursday 29 December 2005 21:13, Jean Delvare wrote:
> > 
> > > No, it wouldn't produce the desired effect anymore.
> > 
> > Did you try it?
	Using choice with two tristate config options seems to provide the
better look and feel, while keeping the desired effect. The only
drawback is that Kconfig doesn't accept default values for the "config"
inside a choice. It would be nice if both choice and the ALSA/OSS
options be marked as "m" by default.
	Anyway, IMHO, this is better and clearer than the previous patches.

Cheers, 
Mauro.

V4L/DVB: change alsa/oss option to choice

Using tristate choice Kconfig option seems to produce a better result.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---

 drivers/media/video/saa7134/Kconfig |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 86e1bb3..70f03f5 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -12,9 +12,14 @@ config VIDEO_SAA7134
 	  To compile this driver as a module, choose M here: the
 	  module will be called saa7134.
 
+choice
+	prompt "Philips SAA7134 DMA audio support"
+	depends on VIDEO_SAA7134 && SOUND
+	default m
+
 config VIDEO_SAA7134_ALSA
-	tristate "Philips SAA7134 DMA audio support"
-	depends on VIDEO_SAA7134 && SND
+	tristate "ALSA audio support"
+	depends on SND
 	select SND_PCM_OSS
 	---help---
 	  This is a video4linux driver for direct (DMA) audio in
@@ -24,8 +29,8 @@ config VIDEO_SAA7134_ALSA
 	  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 || (VIDEO_SAA7134_ALSA=m && m))
+	tristate "OSS audio support (DEPRECATED)"
+	depends on SOUND_PRIME
 	---help---
 	  This is a video4linux driver for direct (DMA) audio in
 	  Philips SAA713x based TV cards using OSS
@@ -34,6 +39,7 @@ config VIDEO_SAA7134_OSS
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called saa7134-oss.
+endchoice
 
 config VIDEO_SAA7134_DVB
 	tristate "DVB/ATSC Support for saa7134 based TV cards"