From 66dd93809862b0ceae82c8e8fbd781805f47db88 Mon Sep 17 00:00:00 2001
From: hermann pitton <hermann-pitton@arcor.de>
Date: Sun, 7 Jan 2007 21:19:48 -0300
Subject: [PATCH] --- yaml --- r: 45515 b: refs/heads/master c:
 e382f62be8a92ebbdf697ebfab260b7d943a359f h: refs/heads/master i:   45513:
 80cdb3f64e4e5ee5385982e51db8b3bbcc142219   45511:
 b17f5290374c63ee74c25bd0b325fb7ae07c9a9b v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/media/video/saa7134/saa7134-cards.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 232e191c3a18..4a96340b7f05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55d5440d4587454628a850ce26703639885af678
+refs/heads/master: e382f62be8a92ebbdf697ebfab260b7d943a359f
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 4dead84aff46..ae984bbe36b6 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -2570,6 +2570,7 @@ struct saa7134_board saa7134_boards[] = {
 		.radio_type     = UNSET,
 		.tuner_addr	= ADDR_UNSET,
 		.radio_addr	= ADDR_UNSET,
+		.gpiomask       = 1 << 21,
 		.inputs = {{
 			.name   = name_tv,
 			.vmux   = 1,
@@ -2578,15 +2579,20 @@ struct saa7134_board saa7134_boards[] = {
 		},{
 			.name   = name_comp1,
 			.vmux   = 3,
-			.amux   = LINE1,
+			.amux   = LINE2,	/* unconfirmed, taken from Philips driver */
+		},{
+			.name   = name_comp2,
+			.vmux   = 0,		/* untested, Composite over S-Video */
+			.amux   = LINE2,
 		},{
 			.name   = name_svideo,
-			.vmux   = 0,
-			.amux   = LINE1,
+			.vmux   = 8,
+			.amux   = LINE2,
 		}},
 		.radio = {
 			.name   = name_radio,
-			.amux   = LINE1,
+			.amux   = TV,
+			.gpio   = 0x0200000,
 		},
 	},
 	[SAA7134_BOARD_CINERGY250PCI] = {