V4L/DVB (13722): [Mantis] Revert 13560

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/dvb/mantis/mantis_core.c

@@ -111,7 +111,6 @@ static void mantis_load_config(struct mantis_pci *mantis)
 		mantis->hwconfig = &vp1034_mantis_config;
 		break;
 	case MANTIS_VP_2033_DVB_C:	// VP-2033
-	case TERRATEC_CINERGY_C_PCI:	// Terratec Cinergy C PCI
 		mantis->hwconfig = &vp2033_mantis_config;
 		break;
 	case MANTIS_VP_3030_DVB_T:	// VP-3030

drivers/media/dvb/mantis/mantis_dvb.c

@@ -251,19 +251,6 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis)
 
 		}
 		break;
-	case TERRATEC_CINERGY_C_PCI:
-		dprintk(verbose, MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
-		mantis->fe = tda10023_attach(&philips_cu1216_config, &mantis->adapter, read_pwm(mantis));
-		if (mantis->fe) {
-			mantis->fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set;
-			dprintk(verbose, MANTIS_ERROR, 1,
-				"found Philips CU1216 DVB-C frontend 0x%02x",
-				philips_cu1216_config.demod_address);
-
-			dprintk(verbose, MANTIS_ERROR, 1,
-				"Mantis DVB-C Philips CU1216 frontend attach success");
-		}
-		break;
 	default:
 		dprintk(verbose, MANTIS_DEBUG, 1, "Unknown frontend:[0x%02x]",
 			mantis->sub_device_id);

drivers/media/dvb/mantis/mantis_vp2033.h

@@ -26,7 +26,6 @@
 #include "tda1002x.h"
 
 #define MANTIS_VP_2033_DVB_C	0x0008
-#define TERRATEC_CINERGY_C_PCI	0x1178
 
 extern struct tda1002x_config philips_cu1216_config;
 extern struct mantis_hwconfig vp2033_mantis_config;