From b65e106a115ff669d2750686670ca3fd65f247f6 Mon Sep 17 00:00:00 2001
From: Vladimir Ermakov <vooon341@gmail.com>
Date: Wed, 7 Apr 2010 02:23:31 -0300
Subject: [PATCH] --- yaml --- r: 192909 b: refs/heads/master c:
 e838326312bbacd6c320113711e2662568d4fc6c h: refs/heads/master i:   192907:
 bd94dbcbc9f78a5c3521c67e8eba430ec2a777db v: v3

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

diff --git a/[refs] b/[refs]
index f84b9bc760eb..ffd422de69de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e20144770f5a119516f93959eca9818fa5ff065e
+refs/heads/master: e838326312bbacd6c320113711e2662568d4fc6c
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 655068f6c491..b937d4da3136 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -5364,12 +5364,12 @@ struct saa7134_board saa7134_boards[] = {
 		.radio_type    = UNSET,
 		.tuner_addr   = ADDR_UNSET,
 		.radio_addr   = ADDR_UNSET,
-		.gpiomask      = 0x01fc00,
+		.gpiomask      = 0x389c00,
 		.inputs       = {{
 			.name = name_comp1,
 			.vmux = 3,
 			.amux = LINE1,
-			.gpio = 0x389c00,
+			.gpio = 0x01fc00,
 		} },
 	},
 
diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c
index ae17b853f957..c8c1c9ae6a79 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-input.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-input.c
@@ -607,7 +607,6 @@ int saa7134_input_init1(struct saa7134_dev *dev)
 	switch (dev->board) {
 	case SAA7134_BOARD_FLYVIDEO2000:
 	case SAA7134_BOARD_FLYVIDEO3000:
-	case SAA7134_BOARD_HAWELL_HW_404M7:
 	case SAA7134_BOARD_FLYTVPLATINUM_FM:
 	case SAA7134_BOARD_FLYTVPLATINUM_MINI2:
 	case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: