aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dm1105/dm1105.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/dm1105/dm1105.c')
-rw-r--r--drivers/media/dvb/dm1105/dm1105.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 0c1790fe2b5..f7321448b4b 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -39,8 +39,8 @@
39#include "dvb-pll.h" 39#include "dvb-pll.h"
40 40
41#include "stv0299.h" 41#include "stv0299.h"
42/*#include "stv0288.h" 42#include "stv0288.h"
43 *#include "stb6000.h"*/ 43#include "stb6000.h"
44#include "si21xx.h" 44#include "si21xx.h"
45#include "cx24116.h" 45#include "cx24116.h"
46#include "z0194a.h" 46#include "z0194a.h"
@@ -594,13 +594,12 @@ static void dm1105dvb_hw_exit(struct dm1105dvb *dm1105dvb)
594 594
595 dm1105dvb_dma_unmap(dm1105dvb); 595 dm1105dvb_dma_unmap(dm1105dvb);
596} 596}
597#if 0 597
598static struct stv0288_config earda_config = { 598static struct stv0288_config earda_config = {
599 .demod_address = 0x68, 599 .demod_address = 0x68,
600 .min_delay_ms = 100, 600 .min_delay_ms = 100,
601}; 601};
602 602
603#endif /* keep */
604static struct si21xx_config serit_config = { 603static struct si21xx_config serit_config = {
605 .demod_address = 0x68, 604 .demod_address = 0x68,
606 .min_delay_ms = 100, 605 .min_delay_ms = 100,
@@ -627,7 +626,7 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
627 dvb_attach(dvb_pll_attach, dm1105dvb->fe, 0x60, 626 dvb_attach(dvb_pll_attach, dm1105dvb->fe, 0x60,
628 &dm1105dvb->i2c_adap, DVB_PLL_OPERA1); 627 &dm1105dvb->i2c_adap, DVB_PLL_OPERA1);
629 } 628 }
630#if 0 629
631 if (!dm1105dvb->fe) { 630 if (!dm1105dvb->fe) {
632 dm1105dvb->fe = dvb_attach( 631 dm1105dvb->fe = dvb_attach(
633 stv0288_attach, &earda_config, 632 stv0288_attach, &earda_config,
@@ -639,7 +638,7 @@ static int __devinit frontend_init(struct dm1105dvb *dm1105dvb)
639 &dm1105dvb->i2c_adap); 638 &dm1105dvb->i2c_adap);
640 } 639 }
641 } 640 }
642#endif /* keep */ 641
643 if (!dm1105dvb->fe) { 642 if (!dm1105dvb->fe) {
644 dm1105dvb->fe = dvb_attach( 643 dm1105dvb->fe = dvb_attach(
645 si21xx_attach, &serit_config, 644 si21xx_attach, &serit_config,