summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/dm1105/dm1105.c
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2008-09-14 02:56:59 +0300
committerIgor M. Liplianin <liplianin@me.by>2008-09-14 02:56:59 +0300
commit18e7f955906a13d81aa379e24fb28eb68c952694 (patch)
treec5fc9bae6cfc2fd7a6a61b79f03c791d811c6c5a /linux/drivers/media/dvb/dm1105/dm1105.c
parent03f126b4400180196e62b69757c708b8ac2b40ae (diff)
downloadmediapointer-dvb-s2-18e7f955906a13d81aa379e24fb28eb68c952694.tar.gz
mediapointer-dvb-s2-18e7f955906a13d81aa379e24fb28eb68c952694.tar.bz2
Add support for DvbWorld 2004 DVB-S2 PCI adapter
From: Igor M. Liplianin <liplianin@me.by> Add support for DvbWorld 2004 DVB-S2 PCI adapter. The card contains dm1105 PCI chip and cx24116 demodulator Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Diffstat (limited to 'linux/drivers/media/dvb/dm1105/dm1105.c')
-rw-r--r--linux/drivers/media/dvb/dm1105/dm1105.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/dm1105/dm1105.c b/linux/drivers/media/dvb/dm1105/dm1105.c
index 2dd31ee00..7f300d4e7 100644
--- a/linux/drivers/media/dvb/dm1105/dm1105.c
+++ b/linux/drivers/media/dvb/dm1105/dm1105.c
@@ -41,8 +41,8 @@
#include "stv0299.h"
/*#include "stv0288.h"
*#include "si21xx.h"
- *#include "stb6000.h"
- *#include "cx24116.h"*/
+ *#include "stb6000.h"*/
+#include "cx24116.h"
#include "z0194a.h"
/* ----------------------------------------------- */
@@ -613,11 +613,11 @@ static struct si21xx_config serit_config = {
.min_delay_ms = 100,
};
+#endif /* keep */
static struct cx24116_config serit_sp2633_config = {
.demod_address = 0x55,
};
-#endif /* keep */
static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
{
@@ -659,15 +659,11 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
#endif /* keep */
break;
case PCI_DEVICE_ID_DW2004:
-#if 0 /* keep */
dm1105dvb->fe = dvb_attach(
cx24116_attach, &serit_sp2633_config,
&dm1105dvb->i2c_adap);
if (dm1105dvb->fe)
dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage;
-#else /* keep */
- dev_err(&dm1105dvb->pdev->dev, "needs cx24116 module\n");
-#endif /* keep */
break;
}