msg

3 files changed, 5 insertions, 33 deletions

diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 014d47dfb..c956a0e84 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-cards.c,v 1.62 2005/06/14 22:38:46 hhackmann Exp $
+ * $Id: saa7134-cards.c,v 1.64 2005/06/15 17:36:11 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * card-specific stuff.
@@ -1567,33 +1567,6 @@ struct saa7134_board saa7134_boards[] = {
 			.amux = LINE2,
 		}},
 	},
-    [SAA7134_BOARD_AVERMEDIA_307] = {
-           /*
-             Davydov Vladimir <vladimir@iqmedia.com>
-           */
-           .name           = "Avermedia AVerTV 307",
-           .audio_clock    = 0x00187de7,
-           .tuner_type     = TUNER_PHILIPS_FQ1216ME,
-           .tda9887_conf   = TDA9887_PRESENT,
-           .inputs         = {{
-                   .name = name_tv,
-                   .vmux = 1,
-                   .amux = TV,
-                   .tv   = 1,
-           },{
-                   .name = name_comp1,
-                   .vmux = 0,
-                   .amux = LINE1,
-           },{
-                   .name = name_comp2,
-                   .vmux = 3,
-                   .amux = LINE1,
-           },{
-                   .name = name_svideo,
-                   .vmux = 8,
-                   .amux = LINE1,
-           }},
-    },
 	[SAA7134_BOARD_PHILIPS_TOUGH] = {
 		.name           = "Philips TOUGH DVB-T reference design",
 		.tuner_type	= TUNER_ABSENT,
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index e03f80fa9..78647466a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-video.c,v 1.31 2005/06/14 22:49:20 hhackmann Exp $
+ * $Id: saa7134-video.c,v 1.33 2005/06/15 17:36:11 mkrufky Exp $
  *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
@@ -274,7 +274,6 @@ static struct saa7134_tvnorm tvnorms[] = {
 
 		.h_start       = 0,
 		.h_stop        = 719,
-		.video_v_start = 22,
   		.video_v_start = 23,
   		.video_v_stop  = 262,
   		.vbi_v_start_0 = 10,
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index f74ca74ea..92c9b1a76 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
 /*
- * $Id: tuner-simple.c,v 1.22 2005/06/14 22:52:59 hhackmann Exp $
+ * $Id: tuner-simple.c,v 1.24 2005/06/15 17:36:11 mkrufky Exp $
  *
  * i2c tv tuner chip device driver
  * controls all those simple 4-control-bytes style tuners.
@@ -212,8 +212,6 @@ static struct tunertype tuners[] = {
 	  16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
 	{ "Philips FQ1236A MK4", Philips, NTSC,
 	  16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
-	{ "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL,
-	  16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 },          
 
 	/* Should work for TVF8531MF, TVF8831MF, TVF8731MF */
 	{ "Ymec TVision TVF-8531MF", Philips, NTSC,
@@ -228,6 +226,8 @@ static struct tunertype tuners[] = {
 	/* This entry is for TEA5767 FM radio only chip used on several boards w/TV tuner */
 	{ TEA5767_TUNER_NAME, Philips, RADIO,
           -1, -1, 0, 0, 0, TEA5767_LOW_LO_32768,0},	
+	{ "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL,
+	  16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 },          
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);