[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>
This commit is contained in:
parent
e597cb32e9
commit
80c72579f7
|
@ -14,7 +14,7 @@ config VIDEO_SAA7134
|
||||||
|
|
||||||
config VIDEO_SAA7134_ALSA
|
config VIDEO_SAA7134_ALSA
|
||||||
tristate "Philips SAA7134 DMA audio support"
|
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
|
select SND_PCM_OSS
|
||||||
---help---
|
---help---
|
||||||
This is a video4linux driver for direct (DMA) audio in
|
This is a video4linux driver for direct (DMA) audio in
|
||||||
|
@ -25,7 +25,7 @@ config VIDEO_SAA7134_ALSA
|
||||||
|
|
||||||
config VIDEO_SAA7134_OSS
|
config VIDEO_SAA7134_OSS
|
||||||
tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)"
|
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---
|
---help---
|
||||||
This is a video4linux driver for direct (DMA) audio in
|
This is a video4linux driver for direct (DMA) audio in
|
||||||
Philips SAA713x based TV cards using OSS
|
Philips SAA713x based TV cards using OSS
|
||||||
|
|
Loading…
Reference in New Issue