From 4dbe4c6020b6ca8b60ac4b44d0770fc225b8cf68 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 7 Jan 2008 05:20:04 -0300
Subject: [PATCH] --- yaml --- r: 76706 b: refs/heads/master c:
 1434bc0cbb842ed71eada244ac46185e3b17e4e2 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../video4linux/CARDLIST.saa7134              |  2 +-
 .../media/video/saa7134/saa7134-cards.c       | 27 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 895026595ac2..f57a61b43a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 616f8878bc5b5b2276f1941643d9ca7c88690305
+refs/heads/master: 1434bc0cbb842ed71eada244ac46185e3b17e4e2
diff --git a/trunk/Documentation/video4linux/CARDLIST.saa7134 b/trunk/Documentation/video4linux/CARDLIST.saa7134
index 387c35f2ecd7..fda570e50fa8 100644
--- a/trunk/Documentation/video4linux/CARDLIST.saa7134
+++ b/trunk/Documentation/video4linux/CARDLIST.saa7134
@@ -121,7 +121,7 @@
 120 -> Beholder BeholdTV 403 FM                 [1131:0000,0000:4037]
 121 -> Beholder BeholdTV 405                    [0000:4050]
 122 -> Beholder BeholdTV 405 FM                 [0000:4051]
-123 ->                                          [0000:4070]
+123 -> Beholder BeholdTV 407                    [0000:4070]
 124 -> Beholder BeholdTV 407 FM                 [0000:4071]
 125 -> Beholder BeholdTV 409                    [0000:4090]
 126 -> Beholder BeholdTV 505 FM/RDS             [0000:5051,0000:505B,5ace:5050]
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 6a35d88fdbb2..46b6ac4b3105 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -3687,6 +3687,33 @@ struct saa7134_board saa7134_boards[] = {
 			.amux = LINE2,
 		},
 	},
+	[SAA7134_BOARD_BEHOLD_407] = {
+		.name 		= "Beholder BeholdTV 407",
+		.audio_clock 	= 0x00187de7,
+		.tuner_type 	= TUNER_PHILIPS_FM1216ME_MK3,
+		.radio_type 	= UNSET,
+		.tuner_addr 	= ADDR_UNSET,
+		.radio_addr 	= ADDR_UNSET,
+		.tda9887_conf 	= TDA9887_PRESENT,
+		.gpiomask = 0xc0c000,
+		.inputs = {{
+			.name = name_svideo,
+			.vmux = 8,
+			.amux = LINE1,
+			.gpio = 0xc0c000,
+		},{
+			.name = name_comp1,
+			.vmux = 1,
+			.amux = LINE1,
+			.gpio = 0xc0c000,
+		},{
+			.name = name_tv,
+			.vmux = 3,
+			.amux = TV,
+			.tv = 1,
+			.gpio = 0xc0c000,
+		}},
+	},
 	[SAA7134_BOARD_BEHOLD_407FM] = {
 		.name 		= "Beholder BeholdTV 407 FM",
 		.audio_clock 	= 0x00187de7,