diff options
| author | Igor M. Liplianin <liplianin@me.by> | 2008-09-14 03:56:59 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 15:37:06 +0400 |
| commit | 35d9c42779ef5e8cb46902bb6987443e136c0517 (patch) | |
| tree | 043831fd476d77c848b3df591ccf02d2677859ee /drivers/media/dvb/dm1105 | |
| parent | 490c868408bc57a756550148313ac8582fe501ef (diff) | |
| download | linux-35d9c42779ef5e8cb46902bb6987443e136c0517.tar.xz | |
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')
| -rw-r--r-- | drivers/media/dvb/dm1105/Kconfig | 19 | ||||
| -rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 10 |
2 files changed, 13 insertions, 16 deletions
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig index fc2ca7dca6b2..4b96bbba9f42 100644 --- a/drivers/media/dvb/dm1105/Kconfig +++ b/drivers/media/dvb/dm1105/Kconfig @@ -1,14 +1,15 @@ config DVB_DM1105 - tristate "SDMC DM1105 based PCI cards" - depends on DVB_CORE && PCI && I2C + tristate "SDMC DM1105 based PCI cards" + depends on DVB_CORE && PCI && I2C select DVB_PLL if !DVB_FE_CUSTOMISE select DVB_STV0299 if !DVB_FE_CUSTOMISE - help - Support for cards based on the SDMC DM1105 PCI chip like - DvbWorld 2002 + select DVB_CX24116 if !DVB_FE_CUSTOMISE + help + Support for cards based on the SDMC DM1105 PCI chip like + DvbWorld 2002 - Since these cards have no MPEG decoder onboard, they transmit - only compressed MPEG data over the PCI bus, so you need - an external software decoder to watch TV on your computer. + Since these cards have no MPEG decoder onboard, they transmit + only compressed MPEG data over the PCI bus, so you need + an external software decoder to watch TV on your computer. - Say Y or M if you own such a device and want to use it. + Say Y or M if you own such a device and want to use it. diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index fe8d0e58c0ea..204763d2de41 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; } |