diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/Kconfig | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig index 6127c8014..8a5c3e71b 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 + depends on VIDEO_SAA7134 && 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 && m ) ) + depends on VIDEO_SAA7134 && SOUND_PRIME && !VIDEO_SAA7134_ALSA ---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 674769cd3..5f6c35c7d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2006-01-03 16:28 mchehab + + * linux/drivers/media/video/saa7134/Kconfig: + - small cleanups + + Signed-off-by: Jean Delvare <khali@linux-fr.org> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2006-01-03 13:36 rmcc * linux/drivers/media/video/cx88/cx88-alsa.c: |