summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dm1105
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2008-09-16 18:21:11 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:37:06 -0200
commit04ad28c9916da709f38b1d43817892142c2c3508 (patch)
tree1ae338bce55ef7322dd96237a601f322639e4dac /drivers/media/dvb/dm1105
parent34c080295af9b3ed9f704a881e07eb5ac128e1ed (diff)
downloadtalos-op-linux-04ad28c9916da709f38b1d43817892142c2c3508.tar.gz
talos-op-linux-04ad28c9916da709f38b1d43817892142c2c3508.zip
V4L/DVB (9017): Add support for Silicon Laboratories SI2109/2110 demodulators.
Add support for Silicon Laboratories SI2109/2110 demodulator and cards with it, such as DvbWorld PCI2002. Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dm1105')
-rw-r--r--drivers/media/dvb/dm1105/Kconfig1
-rw-r--r--drivers/media/dvb/dm1105/dm1105.c7
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig
index 4b96bbba9f42..2af5fffe138e 100644
--- a/drivers/media/dvb/dm1105/Kconfig
+++ b/drivers/media/dvb/dm1105/Kconfig
@@ -4,6 +4,7 @@ config DVB_DM1105
select DVB_PLL if !DVB_FE_CUSTOMISE
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_CX24116 if !DVB_FE_CUSTOMISE
+ select DVB_SI21XX if !DVB_FE_CUSTOMISE
help
Support for cards based on the SDMC DM1105 PCI chip like
DvbWorld 2002
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 204763d2de41..0c1790fe2b56 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -40,8 +40,8 @@
#include "stv0299.h"
/*#include "stv0288.h"
- *#include "si21xx.h"
*#include "stb6000.h"*/
+#include "si21xx.h"
#include "cx24116.h"
#include "z0194a.h"
@@ -600,12 +600,12 @@ static struct stv0288_config earda_config = {
.min_delay_ms = 100,
};
+#endif /* keep */
static struct si21xx_config serit_config = {
.demod_address = 0x68,
.min_delay_ms = 100,
};
-#endif /* keep */
static struct cx24116_config serit_sp2633_config = {
.demod_address = 0x55,
@@ -639,7 +639,7 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
&dm1105dvb->i2c_adap);
}
}
-
+#endif /* keep */
if (!dm1105dvb->fe) {
dm1105dvb->fe = dvb_attach(
si21xx_attach, &serit_config,
@@ -648,7 +648,6 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
dm1105dvb->fe->ops.set_voltage =
dm1105dvb_set_voltage;
}
-#endif /* keep */
break;
case PCI_DEVICE_ID_DW2004:
dm1105dvb->fe = dvb_attach(
OpenPOWER on IntegriCloud