tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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: Jean Delvare <khali@linux-fr.org>
Acked-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Jean Delvare and committed by
Linus Torvalds 80c72579 e597cb32

+2 -2
+2 -2
drivers/media/video/saa7134/Kconfig
··· 14 14 15 15 config VIDEO_SAA7134_ALSA 16 16 tristate "Philips SAA7134 DMA audio support" 17 - depends on VIDEO_SAA7134 && SOUND && SND && (!VIDEO_SAA7134_OSS || VIDEO_SAA7134_OSS = m) 17 + depends on VIDEO_SAA7134 && SND 18 18 select SND_PCM_OSS 19 19 ---help--- 20 20 This is a video4linux driver for direct (DMA) audio in ··· 25 25 26 26 config VIDEO_SAA7134_OSS 27 27 tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)" 28 - depends on VIDEO_SAA7134 && SOUND_PRIME && (!VIDEO_SAA7134_ALSA || VIDEO_SAA7134_ALSA = m) 28 + depends on VIDEO_SAA7134 && SOUND_PRIME && (!VIDEO_SAA7134_ALSA || (VIDEO_SAA7134_ALSA=m && m)) 29 29 ---help--- 30 30 This is a video4linux driver for direct (DMA) audio in 31 31 Philips SAA713x based TV cards using OSS