summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c5
-rw-r--r--v4l/ChangeLog7
2 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index b2a8a7c3f..130621a2f 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-cards.c,v 1.87 2005/07/15 21:44:14 mchehab Exp $
+ * $Id: cx88-cards.c,v 1.88 2005/07/20 20:05:12 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -91,6 +91,9 @@ struct cx88_board cx88_boards[] = {
.input = {{
.type = CX88_VMUX_TELEVISION,
.vmux = 0,
+ },{
+ .type = CX88_VMUX_SVIDEO,
+ .vmux = 2,
}},
},
[CX88_BOARD_PIXELVIEW] = {
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index edc7a00d8..faf982682 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-20 08:03 mkrufky
+ * cx88-cards.c:
+ - Add support for the SVideo input on the GDI Black Gold.
+
+ From: Peter Missel <peter.missel@onlinehome.de>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-07-20 07:40 mkrufky
* bttv-driver.c:
- pci_dma_supported() is called after pci_set_dma_mask() which