From de603a1f491c11ef8c8498f255983b369b63c992 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@m1k.net>
Date: Thu, 23 Jun 2005 22:04:56 -0700
Subject: [PATCH] --- yaml --- r: 3139 b: refs/heads/master c:
 3c1d0185db6a44b6304c404f4da1a1a98746ca46 h: refs/heads/master i:   3137:
 39ef63bbdba849e20694bc774d92363cf6a7f934   3135:
 92b0b655fd835ee9ec24aab757d9a6910e89c3b7 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx88/cx88-cards.c | 2 +-
 trunk/drivers/media/video/tuner-simple.c    | 3 +++
 trunk/include/media/tuner.h                 | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82ea2f4e77b6..2e969e8d9c08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80d34362f391840dcb10c0ec261f765871a586f7
+refs/heads/master: 3c1d0185db6a44b6304c404f4da1a1a98746ca46
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index c3a561e38e54..a6763f1a44c1 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -431,7 +431,7 @@ struct cx88_board cx88_boards[] = {
 	},
         [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
                 .name           = "DViCO - FusionHDTV 3 Gold-T",
-                .tuner_type     = 52, /* Thomson DDT 7611 ATSC/NTSC */
+                .tuner_type     = 60, /* Thomson DDT 7611 ATSC/NTSC */
                /*  See DViCO FusionHDTV 3 Gold for GPIO documentation.  */
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
index f7305c8d53de..866f18dc5b58 100644
--- a/trunk/drivers/media/video/tuner-simple.c
+++ b/trunk/drivers/media/video/tuner-simple.c
@@ -217,6 +217,9 @@ static struct tunertype tuners[] = {
 	  16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
 	{ "Ymec TVision TVF-5533MF", Philips, NTSC,
 	  16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},
+
+	{ "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,
+	  16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
 };
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
 
diff --git a/trunk/include/media/tuner.h b/trunk/include/media/tuner.h
index 6d29d8db0c83..cb75f4809c4d 100644
--- a/trunk/include/media/tuner.h
+++ b/trunk/include/media/tuner.h
@@ -101,6 +101,8 @@
 #define TUNER_YMEC_TVF_8531MF 58
 #define TUNER_YMEC_TVF_5533MF 59	/* Pixelview Pro Ultra NTSC */
 
+#define TUNER_THOMSON_DTT7611    60
+
 #define NOTUNER 0
 #define PAL     1	/* PAL_BG */
 #define PAL_I   2