diff options
author | Igor M. Liplianin <liplianin@me.by> | 2008-09-13 19:56:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:06 -0400 |
commit | 35d9c42779ef5e8cb46902bb6987443e136c0517 (patch) | |
tree | 043831fd476d77c848b3df591ccf02d2677859ee /drivers/media/dvb/dm1105/dm1105.c | |
parent | 490c868408bc57a756550148313ac8582fe501ef (diff) |
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 fe8d0e58c0ea..204763d2de41 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -41,8 +41,8 @@ | |||
41 | #include "stv0299.h" | 41 | #include "stv0299.h" |
42 | /*#include "stv0288.h" | 42 | /*#include "stv0288.h" |
43 | *#include "si21xx.h" | 43 | *#include "si21xx.h" |
44 | *#include "stb6000.h" | 44 | *#include "stb6000.h"*/ |
45 | *#include "cx24116.h"*/ | 45 | #include "cx24116.h" |
46 | #include "z0194a.h" | 46 | #include "z0194a.h" |
47 | 47 | ||
48 | /* ----------------------------------------------- */ | 48 | /* ----------------------------------------------- */ |
@@ -605,11 +605,11 @@ static struct si21xx_config serit_config = { | |||
605 | .min_delay_ms = 100, | 605 | .min_delay_ms = 100, |
606 | 606 | ||
607 | }; | 607 | }; |
608 | #endif /* keep */ | ||
608 | 609 | ||
609 | static struct cx24116_config serit_sp2633_config = { | 610 | static struct cx24116_config serit_sp2633_config = { |
610 | .demod_address = 0x55, | 611 | .demod_address = 0x55, |
611 | }; | 612 | }; |
612 | #endif /* keep */ | ||
613 | 613 | ||
614 | static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) | 614 | static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) |
615 | { | 615 | { |
@@ -651,15 +651,11 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) | |||
651 | #endif /* keep */ | 651 | #endif /* keep */ |
652 | break; | 652 | break; |
653 | case PCI_DEVICE_ID_DW2004: | 653 | case PCI_DEVICE_ID_DW2004: |
654 | #if 0 | ||
655 | dm1105dvb->fe = dvb_attach( | 654 | dm1105dvb->fe = dvb_attach( |
656 | cx24116_attach, &serit_sp2633_config, | 655 | cx24116_attach, &serit_sp2633_config, |
657 | &dm1105dvb->i2c_adap); | 656 | &dm1105dvb->i2c_adap); |
658 | if (dm1105dvb->fe) | 657 | if (dm1105dvb->fe) |
659 | dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage; | 658 | dm1105dvb->fe->ops.set_voltage = dm1105dvb_set_voltage; |
660 | #else /* keep */ | ||
661 | dev_err(&dm1105dvb->pdev->dev, "needs cx24116 module\n"); | ||
662 | #endif /* keep */ | ||
663 | break; | 659 | break; |
664 | } | 660 | } |
665 | 661 | ||