summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-12-27 23:45:57 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-12-27 23:45:57 +0000
commit9ee5ef9eeafb36db8e8d2be75d9250a9cd8cac93 (patch)
tree76963747eda401b8db4b5b445ce60f654b9bc280 /linux/drivers/media/video
parent96681a7205113eae3c98a6342880b8fa836069a4 (diff)
downloadmediapointer-dvb-s2-9ee5ef9eeafb36db8e8d2be75d9250a9cd8cac93.tar.gz
mediapointer-dvb-s2-9ee5ef9eeafb36db8e8d2be75d9250a9cd8cac93.tar.bz2
Fixes Kconfig warning at saa7134 Kconfig
- Fixes: Warning! Found recursive dependency: VIDEO_SAA7134_ALSA VIDEO_SAA7134_OSS VIDEO_SAA7134_ALSA Thanks-to: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/saa7134/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig
index c0f604a6f..6127c8014 100644
--- a/linux/drivers/media/video/saa7134/Kconfig
+++ b/linux/drivers/media/video/saa7134/Kconfig
@@ -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 && SOUND && 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