diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-12-28 15:02:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-29 13:26:36 -0500 |
commit | 80c72579f74fcfcd63e27c5e317091cb35bb1f12 (patch) | |
tree | 38ea9f27b602a61139999d1bd1af27d45f2ac3a7 /drivers/media | |
parent | e597cb32e95a6c38e9ead981b169ef2974ccfec0 (diff) |
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index c0f604a6fe42..86e1bb391a4e 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig | |||
@@ -14,7 +14,7 @@ config VIDEO_SAA7134 | |||
14 | 14 | ||
15 | config VIDEO_SAA7134_ALSA | 15 | config VIDEO_SAA7134_ALSA |
16 | tristate "Philips SAA7134 DMA audio support" | 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 | select SND_PCM_OSS | 18 | select SND_PCM_OSS |
19 | ---help--- | 19 | ---help--- |
20 | This is a video4linux driver for direct (DMA) audio in | 20 | This is a video4linux driver for direct (DMA) audio in |
@@ -25,7 +25,7 @@ config VIDEO_SAA7134_ALSA | |||
25 | 25 | ||
26 | config VIDEO_SAA7134_OSS | 26 | config VIDEO_SAA7134_OSS |
27 | tristate "Philips SAA7134 DMA audio support (OSS, DEPRECATED)" | 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 | ---help--- | 29 | ---help--- |
30 | This is a video4linux driver for direct (DMA) audio in | 30 | This is a video4linux driver for direct (DMA) audio in |
31 | Philips SAA713x based TV cards using OSS | 31 | Philips SAA713x based TV cards using OSS |