summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/Kconfig2
-rw-r--r--v4l/ChangeLog9
2 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig
index 8a5c3e71b..86671a43e 100644
--- a/linux/drivers/media/video/saa7134/Kconfig
+++ b/linux/drivers/media/video/saa7134/Kconfig
@@ -15,7 +15,7 @@ config VIDEO_SAA7134
config VIDEO_SAA7134_ALSA
tristate "Philips SAA7134 DMA audio support"
depends on VIDEO_SAA7134 && SND
- select SND_PCM_OSS
+ select SND_PCM
---help---
This is a video4linux driver for direct (DMA) audio in
Philips SAA713x based TV cards using ALSA
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 016cfc357..7e0de1649 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-12 01:55 mchehab
+
+ * linux/drivers/media/video/saa7134/Kconfig:
+ - There's no reason for an ALSA driver to select an OSS legacy
+ userspace interface.
+
+ Signed-off-by: Adrian Bunk <bunk@stusta.de>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2006-01-12 01:48 mchehab
* linux/drivers/media/dvb/frontends/mt312.c: (mt312_set_frontend):