From b48b5ba3fea138fe9a32990505d4661061667ff5 Mon Sep 17 00:00:00 2001
From: Hermann Pitton <hermann-pitton@arcor.de>
Date: Sun, 20 Jan 2008 19:32:39 -0300
Subject: [PATCH] --- yaml --- r: 85715 b: refs/heads/master c:
 ad1ef131c35bb6967acd5ce3072a32ec1d27b482 h: refs/heads/master i:   85713:
 0334491dcb59e5f21128137053f7ccf9f0beb746   85711:
 f145a44d012d0b016c5ae65e7ed4324abbd7fed4 v: v3

---
 [refs]                                        |  2 +-
 .../media/video/saa7134/saa7134-cards.c       | 31 +++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index be15a2563e65..13f6b9aa3928 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ba243734a0363649c514353334ed3d6ca39a5fb
+refs/heads/master: ad1ef131c35bb6967acd5ce3072a32ec1d27b482
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 176543f723ca..0e8e8081f51c 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -928,27 +928,38 @@ struct saa7134_board saa7134_boards[] = {
 		.tuner_addr	= ADDR_UNSET,
 		.radio_addr	= ADDR_UNSET,
 		.tda9887_conf   = TDA9887_PRESENT,
+		.gpiomask	= 0x03,
 		.inputs         = {{
 			.name = name_tv,
 			.vmux = 1,
 			.amux = TV,
 			.tv   = 1,
-		},{
+			.gpio = 0x00,
+		}, {
 			.name = name_comp1,
-			.vmux = 0,
-			.amux = LINE2,
-		},{
-			.name = name_comp2,
 			.vmux = 3,
-			.amux = LINE2,
-		},{
+			.amux = LINE1,
+			.gpio = 0x02,
+		}, {
+			.name = name_comp2,
+			.vmux = 0,
+			.amux = LINE1,
+			.gpio = 0x02,
+		}, {
 			.name = name_svideo,
 			.vmux = 8,
-			.amux = LINE2,
-		}},
+			.amux = LINE1,
+			.gpio = 0x02,
+		} },
 		.radio = {
 			.name = name_radio,
-			.amux = LINE2,
+			.amux = LINE1,
+			.gpio = 0x01,
+		},
+		.mute  = {
+			.name = name_mute,
+			.amux = TV,
+			.gpio = 0x00,
 		},
 	},
 	[SAA7134_BOARD_BMK_MPEX_TUNER] = {