---

yaml --- r: 179525 b: refs/heads/master c: 616f75e h: refs/heads/master i: 179523: fddd62b v: v3
git-mirror · Jan 17, 2010 · 764f4c3 · 764f4c3
1 parent d51d316
commit 764f4c3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 263645de70175d8b5a5e392a1856e99e2e1b7209
+refs/heads/master: 616f75e1979f5bd1f3241581c720349c2c31f6e7
diff --git a/trunk/drivers/media/dvb/mantis/mantis_dvb.c b/trunk/drivers/media/dvb/mantis/mantis_dvb.c
@@ -32,6 +32,8 @@
 #include "mantis_vp2040.h"
 #include "mantis_vp3030.h"
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 /*	Tuner power supply control	*/
 void mantis_fe_powerup(struct mantis_pci *mantis)
 {
@@ -128,7 +130,8 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
 	dprintk(verbose, MANTIS_DEBUG, 1, "dvb_register_adapter");
 	if (dvb_register_adapter(&mantis->dvb_adapter,
 				 "Mantis dvb adapter", THIS_MODULE,
-				 &mantis->pdev->dev) < 0) {
+				 &mantis->pdev->dev,
+				 adapter_nr) < 0) {
 
 		dprintk(verbose, MANTIS_ERROR, 1, "Error registering adapter");
 		return -ENODEV;

diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp1033.c b/trunk/drivers/media/dvb/mantis/mantis_vp1033.c
@@ -74,7 +74,7 @@ struct stv0299_config lgtdqcs001f_config = {
 	.invert			= 1,
 //	.enhanced_tuning = 0,
 	.skip_reinit		= 0,
-	.lock_output		= STV0229_LOCKOUTPUT_0,
+//	.lock_output		= STV0229_LOCKOUTPUT_0,
 	.volt13_op0_op1		= STV0299_VOLT13_OP0,
 	.min_delay_ms		= 100,
 	.set_symbol_rate	= lgtdqcs001f_set_symbol_rate,

diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp2040.c b/trunk/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -30,7 +30,7 @@ struct mantis_hwconfig vp2040_mantis_config = {
 	.ts_size	= MANTIS_TS_204,
 };
 
-struct tda1002x_config tda10023_cu1216_config = {
+struct tda10023_config tda10023_cu1216_config = {
 	.demod_address = 0x18 >> 1,
 	.invert = 1,
 };
diff --git a/trunk/drivers/media/dvb/mantis/mantis_vp2040.h b/trunk/drivers/media/dvb/mantis/mantis_vp2040.h
@@ -29,7 +29,7 @@
 #define TERRATEC_CINERGY_C_PCI	0x1178
 #define TECHNISAT_CABLESTAR_HD2	0x0002
 
-extern struct tda1002x_config tda10023_cu1216_config;
+extern struct tda10023_config tda10023_cu1216_config;
 extern struct mantis_hwconfig vp2040_mantis_config;
 
 #endif //__MANTIS_VP2040_H