V4L/DVB (6469): tuner: remove TUNER_PHILIPS_TDA8295

TUNER_PHILIPS_TDA8290 will autodetect a TDA8290 or a TDA8295,
so we don't need this separate entry anymore.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Documentation/video4linux/CARDLIST.tuner

@@ -52,7 +52,7 @@ tuner=50 - TCL 2002N
 tuner=51 - Philips PAL/SECAM_D (FM 1256 I-H3)
 tuner=52 - Thomson DTT 7610 (ATSC/NTSC)
 tuner=53 - Philips FQ1286
-tuner=54 - tda8290+75
+tuner=54 - Philips/NXP TDA 8290/8295 + 8275/8275A/18271
 tuner=55 - TCL 2002MB
 tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4)
 tuner=57 - Philips FQ1236A MK4
@@ -73,4 +73,3 @@ tuner=71 - Xceive xc2028/xc3028 tuner
 tuner=72 - Thomson FE6600
 tuner=73 - Samsung TCPG 6121P30A
 tuner=75 - Philips TEA5761 FM Radio
-tuner=76 - tda8295+18271

drivers/media/video/tuner-core.c

@@ -295,7 +295,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		microtune_attach(&t->fe, t->i2c.adapter, t->i2c.addr);
 		break;
 	case TUNER_PHILIPS_TDA8290:
-	case TUNER_PHILIPS_TDA8295:
 	{
 		tda829x_attach(t);
 		break;

drivers/media/video/tuner-types.c

@@ -1366,7 +1366,7 @@ struct tunertype tuners[] = {
 		.count  = ARRAY_SIZE(tuner_philips_fq1286_params),
 	},
 	[TUNER_PHILIPS_TDA8290] = { /* Philips PAL|NTSC */
-		.name   = "tda8290+75",
+		.name   = "Philips/NXP TDA 8290/8295 + 8275/8275A/18271",
 		/* see tda8290.c for details */ },
 	[TUNER_TCL_2002MB] = { /* TCL PAL */
 		.name   = "TCL 2002MB",
@@ -1475,9 +1475,6 @@ struct tunertype tuners[] = {
 		.name   = "Philips TEA5761 FM Radio",
 		/* see tea5767.c for details */
 	},
-	[TUNER_PHILIPS_TDA8295] = { /* Philips PAL|NTSC */
-		.name   = "tda8295+18271",
-		/* see tda8290.c for details */ },
 };
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);

drivers/media/video/tveeprom.c

@@ -257,7 +257,7 @@ hauppauge_tuner[] =
 	{ TUNER_ABSENT,        "LG TAPQ_H702F"},
 	{ TUNER_ABSENT,        "TCL M09WPP_4N_E"},
 	{ TUNER_ABSENT,        "MaxLinear MXL5005_v2"},
-	{ TUNER_PHILIPS_TDA8295, "Philips 18271_8295"},
+	{ TUNER_PHILIPS_TDA8290, "Philips 18271_8295"},
 };
 
 static struct HAUPPAUGE_AUDIOIC

include/media/tuner.h

@@ -124,8 +124,6 @@ extern int tuner_debug;
 #define TUNER_TDA9887                   74      /* This tuner should be used only internally */
 #define TUNER_TEA5761			75	/* Only FM Radio Tuner */
 
-#define TUNER_PHILIPS_TDA8295           76
-
 /* tv card specific */
 #define TDA9887_PRESENT 		(1<<0)
 #define TDA9887_PORT1_INACTIVE 		(1<<1)