diff options
| author | Igor M. Liplianin <liplianin@me.by> | 2008-09-13 20:56:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 09:37:06 -0200 |
| commit | 35d9c42779ef5e8cb46902bb6987443e136c0517 (patch) | |
| tree | 043831fd476d77c848b3df591ccf02d2677859ee /drivers/media/dvb/dm1105/dm1105.c | |
| parent | 490c868408bc57a756550148313ac8582fe501ef (diff) | |
| download | kernel_samsung_smdk4412-35d9c42779ef5e8cb46902bb6987443e136c0517.zip kernel_samsung_smdk4412-35d9c42779ef5e8cb46902bb6987443e136c0517.tar.gz kernel_samsung_smdk4412-35d9c42779ef5e8cb46902bb6987443e136c0517.tar.bz2 | |
V4L/DVB (9012): Add support for DvbWorld 2004 DVB-S2 PCI adapter
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dm1105/dm1105.c')
| -rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index fe8d0e5..204763d 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/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" /* ----------------------------------------------- */ @@ -605,11 +605,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) { @@ -651,15 +651,11 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) #endif /* keep */ break; case PCI_DEVICE_ID_DW2004: -#if 0 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; } |