diff options
Diffstat (limited to 'drivers/media/dvb/dm1105')
-rw-r--r-- | drivers/media/dvb/dm1105/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/dm1105/Kconfig b/drivers/media/dvb/dm1105/Kconfig index 4b96bbba9f4..2af5fffe138 100644 --- a/drivers/media/dvb/dm1105/Kconfig +++ b/drivers/media/dvb/dm1105/Kconfig | |||
@@ -4,6 +4,7 @@ config DVB_DM1105 | |||
4 | select DVB_PLL if !DVB_FE_CUSTOMISE | 4 | select DVB_PLL if !DVB_FE_CUSTOMISE |
5 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 5 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
6 | select DVB_CX24116 if !DVB_FE_CUSTOMISE | 6 | select DVB_CX24116 if !DVB_FE_CUSTOMISE |
7 | select DVB_SI21XX if !DVB_FE_CUSTOMISE | ||
7 | help | 8 | help |
8 | Support for cards based on the SDMC DM1105 PCI chip like | 9 | Support for cards based on the SDMC DM1105 PCI chip like |
9 | DvbWorld 2002 | 10 | DvbWorld 2002 |
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 204763d2de4..0c1790fe2b5 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -40,8 +40,8 @@ | |||
40 | 40 | ||
41 | #include "stv0299.h" | 41 | #include "stv0299.h" |
42 | /*#include "stv0288.h" | 42 | /*#include "stv0288.h" |
43 | *#include "si21xx.h" | ||
44 | *#include "stb6000.h"*/ | 43 | *#include "stb6000.h"*/ |
44 | #include "si21xx.h" | ||
45 | #include "cx24116.h" | 45 | #include "cx24116.h" |
46 | #include "z0194a.h" | 46 | #include "z0194a.h" |
47 | 47 | ||
@@ -600,12 +600,12 @@ static struct stv0288_config earda_config = { | |||
600 | .min_delay_ms = 100, | 600 | .min_delay_ms = 100, |
601 | }; | 601 | }; |
602 | 602 | ||
603 | #endif /* keep */ | ||
603 | static struct si21xx_config serit_config = { | 604 | static struct si21xx_config serit_config = { |
604 | .demod_address = 0x68, | 605 | .demod_address = 0x68, |
605 | .min_delay_ms = 100, | 606 | .min_delay_ms = 100, |
606 | 607 | ||
607 | }; | 608 | }; |
608 | #endif /* keep */ | ||
609 | 609 | ||
610 | static struct cx24116_config serit_sp2633_config = { | 610 | static struct cx24116_config serit_sp2633_config = { |
611 | .demod_address = 0x55, | 611 | .demod_address = 0x55, |
@@ -639,7 +639,7 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) | |||
639 | &dm1105dvb->i2c_adap); | 639 | &dm1105dvb->i2c_adap); |
640 | } | 640 | } |
641 | } | 641 | } |
642 | 642 | #endif /* keep */ | |
643 | if (!dm1105dvb->fe) { | 643 | if (!dm1105dvb->fe) { |
644 | dm1105dvb->fe = dvb_attach( | 644 | dm1105dvb->fe = dvb_attach( |
645 | si21xx_attach, &serit_config, | 645 | si21xx_attach, &serit_config, |
@@ -648,7 +648,6 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb) | |||
648 | dm1105dvb->fe->ops.set_voltage = | 648 | dm1105dvb->fe->ops.set_voltage = |
649 | dm1105dvb_set_voltage; | 649 | dm1105dvb_set_voltage; |
650 | } | 650 | } |
651 | #endif /* keep */ | ||
652 | break; | 651 | break; |
653 | case PCI_DEVICE_ID_DW2004: | 652 | case PCI_DEVICE_ID_DW2004: |
654 | dm1105dvb->fe = dvb_attach( | 653 | dm1105dvb->fe = dvb_attach( |