V4L/DVB (13787): [Mantis] Fix build
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index c3a35be..5172e85 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/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 @@
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/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c
index daf02c1..797c4e0 100644
--- a/drivers/media/dvb/mantis/mantis_vp1033.c
+++ b/drivers/media/dvb/mantis/mantis_vp1033.c
@@ -74,7 +74,7 @@
.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/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/dvb/mantis/mantis_vp2040.c
index 07da738..f77be7b 100644
--- a/drivers/media/dvb/mantis/mantis_vp2040.c
+++ b/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -30,7 +30,7 @@
.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/drivers/media/dvb/mantis/mantis_vp2040.h b/drivers/media/dvb/mantis/mantis_vp2040.h
index 645dade..c745754 100644
--- a/drivers/media/dvb/mantis/mantis_vp2040.h
+++ b/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