Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80c72579 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

[PATCH] Fix recursive config dependency for SAA7134 



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

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e597cb32

drivers/media/video/saa7134/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config VIDEO_SAA7134 


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_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)

	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