Re: Recursive dependency for SAA7134 in 2.6.15-rc7

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

Hi Mauro, Linus,

> > I gave a try to 2.6.15-rc7 and "make menuconfig" tells me:
> > Warning! Found recursive dependency: VIDEO_SAA7134_ALSA VIDEO_SAA7134_OSS VIDEO_SAA7134_ALSA
> > 
> > This seems to be the consequence of this patch:
> > http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7bb9529602f8bb41a92275825b808a42ed33e5be
> > 
> > How do we fix that? menuconfig is indeed really confused by the current
> > setup. I have the following patch which makes it happier:
> 
> Please test this patch. It seems that provides the same behavior with a
> non-recursive logic.

Looks good to me, except for the coding style. Also, depending on both
SND and SOUND doesn't make much sense, as SND itself already depends on
SOUND, so we can simplify the SAA7134_ALSA dependency list.

Linus, can you please apply this patch before releasing 2.6.15?

Thanks.

Fix the cyclic dependency issue between CONFIG_SAA7134_ALSA and
CONFIG_SAA7134_OSS (credits to Mauro Carvalho Chehab.)

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

--- linux-2.6.15-rc7.orig/drivers/media/video/saa7134/Kconfig	2005-12-28 19:13:38.000000000 +0100
+++ linux-2.6.15-rc7/drivers/media/video/saa7134/Kconfig	2005-12-28 20:50:37.000000000 +0100
@@ -14,7 +14,7 @@
 
 config VIDEO_SAA7134_ALSA
 	tristate "Philips SAA7134 DMA audio support"
-	depends on VIDEO_SAA7134 && SOUND && SND && (!VIDEO_SAA7134_OSS || VIDEO_SAA7134_OSS = m)
+	depends on VIDEO_SAA7134 && SND
 	select SND_PCM_OSS
 	---help---
 	  This is a video4linux driver for direct (DMA) audio in
@@ -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)
+	depends on VIDEO_SAA7134 && SOUND_PRIME && (!VIDEO_SAA7134_ALSA || (VIDEO_SAA7134_ALSA=m && m))
 	---help---
 	  This is a video4linux driver for direct (DMA) audio in
 	  Philips SAA713x based TV cards using OSS


-- 
Jean Delvare