---

yaml --- r: 179521 b: refs/heads/master c: f5701b6 h: refs/heads/master i: 179519: 239df12 v: v3
git-mirror · Jan 17, 2010 · 12057ba · 12057ba
1 parent 2bdd4bf
commit 12057ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e26c2b46201e5ae38111391c293cec08870b7f6d
+refs/heads/master: f5701b67767c6b81a035c9e2b539025f91d1e84d
diff --git a/trunk/drivers/media/dvb/mantis/mantis_core.c b/trunk/drivers/media/dvb/mantis/mantis_core.c
@@ -121,6 +121,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
 		break;
 	case MANTIS_VP_2040_DVB_C:	// VP-2040
 	case TERRATEC_CINERGY_C_PCI:	// VP-2040 clone
+	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;
 	case MANTIS_VP_3030_DVB_T:	// VP-3030

diff --git a/trunk/drivers/media/dvb/mantis/mantis_dvb.c b/trunk/drivers/media/dvb/mantis/mantis_dvb.c
@@ -275,6 +275,7 @@ int __devinit mantis_frontend_init(struct mantis_pci *mantis)
 		break;
 	case MANTIS_VP_2040_DVB_C:	// VP-2040
 	case TERRATEC_CINERGY_C_PCI:
+	case TECHNISAT_CABLESTAR_HD2:
 		dprintk(verbose, MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
 		mantis->fe = tda10023_attach(&tda10023_cu1216_config, &mantis->adapter, read_pwm(mantis));
 		if (mantis->fe) {

diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp2040.h b/trunk/drivers/media/dvb/mantis/mantis_vp2040.h
@@ -27,6 +27,7 @@
 
 #define MANTIS_VP_2040_DVB_C	0x0043
 #define TERRATEC_CINERGY_C_PCI	0x1178
+#define TECHNISAT_CABLESTAR_HD2	0x0002
 
 extern struct tda1002x_config tda10023_cu1216_config;
 extern struct mantis_hwconfig vp2040_mantis_config;