Re: Recursive dependency for SAA7134 in 2.6.15-rc7

[Jean Delvare <khali@linux-fr.org>]

Hi Roman,

> On Thursday 29 December 2005 21:13, Jean Delvare wrote:
> 
> > No, it wouldn't produce the desired effect anymore.
> >
> > (!VIDEO_SAA7134_ALSA || (VIDEO_SAA7134_ALSA=m && m)) makes it possible
> > to compile both OSS and ALSA support as modules. Simplifying to
> > !VIDEO_SAA7134_ALSA would make it impossible.
> 
> Did you try it?

I didn't back then, just did now, and oh surprise, you are right and I
am wrong... I should have known; after all, *you* wrote kconfig, right?
I checked Documentation/kbuild/kconfig-language.txt and it all makes
sense to me now, although I have to admit the word "counterintuitive"
came to my mind at first. I guess it's just a bit hard to switch to
tristate logic when you use boolean logic all day long.

So, I'm sorry for not verifying it all before I answered to you, and
even more sorry for submitting a less-than-optimal patch for inclusion.
He comes a fix. Linus, feel free to apply it now, or after 2.6.15 is
released, at your option - it's no more a bugfix, only an optimization.

Thanks.

* * * * *

Simplify the VIDEO_SAA7134_OSS Kconfig dependency line a bit. Thanks
to Roman Zippel for the suggestion.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
 drivers/media/video/saa7134/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.15-rc7.orig/drivers/media/video/saa7134/Kconfig	2005-12-29 22:01:20.000000000 +0100
+++ linux-2.6.15-rc7/drivers/media/video/saa7134/Kconfig	2005-12-29 22:04:24.000000000 +0100
@@ -25,7 +25,7 @@
 
 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))
+	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


-- 
Jean Delvare