86 lines
3.1 KiB
Diff
86 lines
3.1 KiB
Diff
From a9c5af3e2ab2bd90a3beae38d26f6be86b2d6bdd Mon Sep 17 00:00:00 2001
|
|
From: Manu Abraham <abraham.manu@gmail.com>
|
|
Date: Fri, 4 Dec 2009 05:33:56 -0300
|
|
Subject: [PATCH 089/120] V4L/DVB (13787): [Mantis] Fix build
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Manu Abraham <manu@linuxtv.org>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
(cherry picked from commit 616f75e1979f5bd1f3241581c720349c2c31f6e7)
|
|
|
|
Signed-off-by: Bjørn Mork <bjorn@mork.no>
|
|
---
|
|
drivers/media/dvb/mantis/mantis_dvb.c | 5 ++++-
|
|
drivers/media/dvb/mantis/mantis_vp1033.c | 2 +-
|
|
drivers/media/dvb/mantis/mantis_vp2040.c | 2 +-
|
|
drivers/media/dvb/mantis/mantis_vp2040.h | 2 +-
|
|
4 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
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 @@ 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/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 @@ 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/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 @@ 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/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
|
|
--
|
|
1.7.1
|
|
|