---

yaml
---
r: 29983
b: refs/heads/master
c: bc53f78
h: refs/heads/master
i:
  29981: bef6fc5
  29979: c424f12
  29975: 327c60e
  29967: 9a03221
  29951: 2ed8f96
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 741b5bb6498e09178f14a3a5b2cc46e9970f46ed
+refs/heads/master: bc53f78306a70d58e26f93d40ce19e61297cc18f

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,