summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/Kconfig3
-rw-r--r--v4l/ChangeLog8
2 files changed, 9 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/Kconfig b/linux/drivers/media/video/cx88/Kconfig
index 76fcb4e99..53308911a 100644
--- a/linux/drivers/media/video/cx88/Kconfig
+++ b/linux/drivers/media/video/cx88/Kconfig
@@ -31,8 +31,7 @@ config VIDEO_CX88_DVB
config VIDEO_CX88_ALSA
tristate "ALSA DMA audio support"
- depends on VIDEO_CX88 && SND
- select SND_PCM_OSS
+ depends on VIDEO_CX88 && SND && EXPERIMENTAL
---help---
This is a video4linux driver for direct (DMA) audio on
Conexant 2388x based TV cards.
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 42e1efbda..bea687fc1 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-15 08:47 mchehab
+
+ * linux/drivers/media/video/cx88/Kconfig:
+ - cx88 alsa is experimental.
+ - Removed need of PCM OSS.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
+
2006-01-15 08:43 mchehab
* linux/drivers/media/video/cx88/cx88-alsa.c: