From 843c13dc09d8ed1e31b688c4995c6462d8406ffc Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Mon, 7 Jul 2008 10:36:16 -0300
Subject: [PATCH] --- yaml --- r: 103913 b: refs/heads/master c:
 0c61621412ca09bd692cef86d4c9f358d5e81b0c h: refs/heads/master i:   103911:
 d4df46cd519076971b3a240908053e8274888ae4 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx18/cx18-cards.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eb0b2e3340c9..4af13fdfa986 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53ad02efe7d5908f0ce73a7dac9530f1180f2514
+refs/heads/master: 0c61621412ca09bd692cef86d4c9f358d5e81b0c
diff --git a/trunk/drivers/media/video/cx18/cx18-cards.c b/trunk/drivers/media/video/cx18/cx18-cards.c
index bb45bcf68ea6..0caae1a5edc4 100644
--- a/trunk/drivers/media/video/cx18/cx18-cards.c
+++ b/trunk/drivers/media/video/cx18/cx18-cards.c
@@ -196,7 +196,7 @@ static const struct cx18_card_pci_info cx18_pci_mpc718[] = {
 static const struct cx18_card cx18_card_mpc718 = {
 	.type = CX18_CARD_YUAN_MPC718,
 	.name = "Yuan MPC718",
-	.comment = "Some Composite and S-Video inputs are currently working.\n",
+	.comment = "Analog video capture works; some audio line in may not.\n",
 	.v4l2_capabilities = CX18_CAP_ENCODER,
 	.hw_audio_ctrl = CX18_HW_CX23418,
 	.hw_all = CX18_HW_TUNER,
@@ -229,7 +229,7 @@ static const struct cx18_card cx18_card_mpc718 = {
 		.tune_lane = 0,
 		.initial_emrs = 2,
 	},
-	.xceive_pin = 15,
+	.xceive_pin = 0,
 	.pci_list = cx18_pci_mpc718,
 	.i2c = &cx18_i2c_std,
 };