From dcb55dbfe4ad943a31a2fd6577e4a8cea0b1e767 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 28 May 2006 01:43:35 -0300
Subject: [PATCH] --- yaml --- r: 29983 b: refs/heads/master c:
 bc53f78306a70d58e26f93d40ce19e61297cc18f h: refs/heads/master i:   29981:
 bef6fc5b9bd3f732e57af489762968857c0d2bf7   29979:
 c424f123424b16371192825c3525436fc0383e6f   29975:
 327c60eb39adce14e54b565cb9ce0f657e8c58e4   29967:
 9a0322119ca110ce35f5aaa7d5e7bdf2b35ad9ee   29951:
 2ed8f961af936a8119a344cb1368c230b79b3ca8 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/video/cx88/cx88-cards.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e36cc9b3323e..5472eda53a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 741b5bb6498e09178f14a3a5b2cc46e9970f46ed
+refs/heads/master: bc53f78306a70d58e26f93d40ce19e61297cc18f
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index 04ef1ccfb67f..352565f4fc99 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -1050,11 +1050,7 @@ struct cx88_board cx88_boards[] = {
 		.dvb            = 1,
 	},
 	[CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = {
-		/* FIXME: Standard video using the cx88 broadcast decoder is
-		 * working, but blackbird isn't working yet, audio is only
-		 * working correctly for television mode. S-Video and Composite
-		 * are working for video-only, so I have them disabled for now.
-		 */
+		/* FIXME: Audio not working for s-video / composite inputs. */
 		.name           = "KWorld HardwareMpegTV XPert",
 		.tuner_type     = TUNER_PHILIPS_TDA8290,
 		.radio_type     = UNSET,
@@ -1065,6 +1061,14 @@ struct cx88_board cx88_boards[] = {
 			.vmux   = 0,
 			.gpio0  = 0x3de2,
 			.gpio2  = 0x00ff,
+		},{
+			.type   = CX88_VMUX_COMPOSITE1,
+			.vmux   = 1,
+			.gpio0  = 0x3de6,
+		},{
+			.type   = CX88_VMUX_SVIDEO,
+			.vmux   = 2,
+			.gpio0  = 0x3de6,
 		}},
 		.radio = {
 			.type   = CX88_RADIO,