diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/Kconfig | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 11 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 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 55b1d8c1d..6de79dc1a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-12-27 23:42 mchehab + + * linux/drivers/media/video/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> + 2005-12-27 13:14 mkrufky * linux/drivers/media/dvb/frontends/Kconfig: |