diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 24 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 15 |
2 files changed, 20 insertions, 19 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index 94efba2d4fe5..08d30f9c2788 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -38,17 +38,17 @@ | |||
38 | #include "cx88.h" | 38 | #include "cx88.h" |
39 | #include "dvb-pll.h" | 39 | #include "dvb-pll.h" |
40 | 40 | ||
41 | #if CONFIG_DVB_MT352 | 41 | #ifdef CONFIG_DVB_MT352 |
42 | # include "mt352.h" | 42 | # include "mt352.h" |
43 | # include "mt352_priv.h" | 43 | # include "mt352_priv.h" |
44 | #endif | 44 | #endif |
45 | #if CONFIG_DVB_CX22702 | 45 | #ifdef CONFIG_DVB_CX22702 |
46 | # include "cx22702.h" | 46 | # include "cx22702.h" |
47 | #endif | 47 | #endif |
48 | #if CONFIG_DVB_OR51132 | 48 | #ifdef CONFIG_DVB_OR51132 |
49 | # include "or51132.h" | 49 | # include "or51132.h" |
50 | #endif | 50 | #endif |
51 | #if CONFIG_DVB_LGDT3302 | 51 | #ifdef CONFIG_DVB_LGDT3302 |
52 | # include "lgdt3302.h" | 52 | # include "lgdt3302.h" |
53 | #endif | 53 | #endif |
54 | 54 | ||
@@ -107,7 +107,7 @@ static struct videobuf_queue_ops dvb_qops = { | |||
107 | 107 | ||
108 | /* ------------------------------------------------------------------ */ | 108 | /* ------------------------------------------------------------------ */ |
109 | 109 | ||
110 | #if CONFIG_DVB_MT352 | 110 | #ifdef CONFIG_DVB_MT352 |
111 | static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe) | 111 | static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe) |
112 | { | 112 | { |
113 | static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 }; | 113 | static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 }; |
@@ -177,7 +177,7 @@ static struct mt352_config dntv_live_dvbt_config = { | |||
177 | }; | 177 | }; |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | #if CONFIG_DVB_CX22702 | 180 | #ifdef CONFIG_DVB_CX22702 |
181 | static struct cx22702_config connexant_refboard_config = { | 181 | static struct cx22702_config connexant_refboard_config = { |
182 | .demod_address = 0x43, | 182 | .demod_address = 0x43, |
183 | .output_mode = CX22702_SERIAL_OUTPUT, | 183 | .output_mode = CX22702_SERIAL_OUTPUT, |
@@ -193,7 +193,7 @@ static struct cx22702_config hauppauge_novat_config = { | |||
193 | }; | 193 | }; |
194 | #endif | 194 | #endif |
195 | 195 | ||
196 | #if CONFIG_DVB_OR51132 | 196 | #ifdef CONFIG_DVB_OR51132 |
197 | static int or51132_set_ts_param(struct dvb_frontend* fe, | 197 | static int or51132_set_ts_param(struct dvb_frontend* fe, |
198 | int is_punctured) | 198 | int is_punctured) |
199 | { | 199 | { |
@@ -210,7 +210,7 @@ static struct or51132_config pchdtv_hd3000 = { | |||
210 | }; | 210 | }; |
211 | #endif | 211 | #endif |
212 | 212 | ||
213 | #if CONFIG_DVB_LGDT3302 | 213 | #ifdef CONFIG_DVB_LGDT3302 |
214 | static int lgdt3302_pll_set(struct dvb_frontend* fe, | 214 | static int lgdt3302_pll_set(struct dvb_frontend* fe, |
215 | struct dvb_frontend_parameters* params, | 215 | struct dvb_frontend_parameters* params, |
216 | u8* pllbuf) | 216 | u8* pllbuf) |
@@ -261,7 +261,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
261 | 261 | ||
262 | /* init frontend */ | 262 | /* init frontend */ |
263 | switch (dev->core->board) { | 263 | switch (dev->core->board) { |
264 | #if CONFIG_DVB_CX22702 | 264 | #ifdef CONFIG_DVB_CX22702 |
265 | case CX88_BOARD_HAUPPAUGE_DVB_T1: | 265 | case CX88_BOARD_HAUPPAUGE_DVB_T1: |
266 | dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config, | 266 | dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config, |
267 | &dev->core->i2c_adap); | 267 | &dev->core->i2c_adap); |
@@ -272,7 +272,7 @@ static int dvb_register(struct cx8802_dev *dev) | |||
272 | &dev->core->i2c_adap); | 272 | &dev->core->i2c_adap); |
273 | break; | 273 | break; |
274 | #endif | 274 | #endif |
275 | #if CONFIG_DVB_MT352 | 275 | #ifdef CONFIG_DVB_MT352 |
276 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: | 276 | case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: |
277 | dev->core->pll_addr = 0x61; | 277 | dev->core->pll_addr = 0x61; |
278 | dev->core->pll_desc = &dvb_pll_lg_z201; | 278 | dev->core->pll_desc = &dvb_pll_lg_z201; |
@@ -294,13 +294,13 @@ static int dvb_register(struct cx8802_dev *dev) | |||
294 | &dev->core->i2c_adap); | 294 | &dev->core->i2c_adap); |
295 | break; | 295 | break; |
296 | #endif | 296 | #endif |
297 | #if CONFIG_DVB_OR51132 | 297 | #ifdef CONFIG_DVB_OR51132 |
298 | case CX88_BOARD_PCHDTV_HD3000: | 298 | case CX88_BOARD_PCHDTV_HD3000: |
299 | dev->dvb.frontend = or51132_attach(&pchdtv_hd3000, | 299 | dev->dvb.frontend = or51132_attach(&pchdtv_hd3000, |
300 | &dev->core->i2c_adap); | 300 | &dev->core->i2c_adap); |
301 | break; | 301 | break; |
302 | #endif | 302 | #endif |
303 | #if CONFIG_DVB_LGDT3302 | 303 | #ifdef CONFIG_DVB_LGDT3302 |
304 | case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q: | 304 | case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q: |
305 | dev->ts_gen_cntrl = 0x08; | 305 | dev->ts_gen_cntrl = 0x08; |
306 | { | 306 | { |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 334bc1850092..48400e0cb34f 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -36,11 +36,11 @@ | |||
36 | #include "saa7134-reg.h" | 36 | #include "saa7134-reg.h" |
37 | #include "saa7134.h" | 37 | #include "saa7134.h" |
38 | 38 | ||
39 | #if CONFIG_DVB_MT352 | 39 | #ifdef CONFIG_DVB_MT352 |
40 | # include "mt352.h" | 40 | # include "mt352.h" |
41 | # include "mt352_priv.h" /* FIXME */ | 41 | # include "mt352_priv.h" /* FIXME */ |
42 | #endif | 42 | #endif |
43 | #if CONFIG_DVB_TDA1004X | 43 | #ifdef CONFIG_DVB_TDA1004X |
44 | # include "tda1004x.h" | 44 | # include "tda1004x.h" |
45 | #endif | 45 | #endif |
46 | 46 | ||
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(antenna_pwr,"enable antenna power (Pinnacle 300i)"); | |||
54 | 54 | ||
55 | /* ------------------------------------------------------------------ */ | 55 | /* ------------------------------------------------------------------ */ |
56 | 56 | ||
57 | #if CONFIG_DVB_MT352 | 57 | #ifdef CONFIG_DVB_MT352 |
58 | static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on) | 58 | static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on) |
59 | { | 59 | { |
60 | u32 ok; | 60 | u32 ok; |
@@ -153,7 +153,7 @@ static struct mt352_config pinnacle_300i = { | |||
153 | 153 | ||
154 | /* ------------------------------------------------------------------ */ | 154 | /* ------------------------------------------------------------------ */ |
155 | 155 | ||
156 | #if CONFIG_DVB_TDA1004X | 156 | #ifdef CONFIG_DVB_TDA1004X |
157 | static int philips_tu1216_pll_init(struct dvb_frontend *fe) | 157 | static int philips_tu1216_pll_init(struct dvb_frontend *fe) |
158 | { | 158 | { |
159 | struct saa7134_dev *dev = fe->dvb->priv; | 159 | struct saa7134_dev *dev = fe->dvb->priv; |
@@ -385,7 +385,7 @@ static int philips_fmd1216_pll_set(struct dvb_frontend *fe, struct dvb_frontend_ | |||
385 | return 0; | 385 | return 0; |
386 | } | 386 | } |
387 | 387 | ||
388 | 388 | #ifdef CONFIG_DVB_TDA1004X | |
389 | static struct tda1004x_config medion_cardbus = { | 389 | static struct tda1004x_config medion_cardbus = { |
390 | .demod_address = 0x08, | 390 | .demod_address = 0x08, |
391 | .invert = 1, | 391 | .invert = 1, |
@@ -398,6 +398,7 @@ static struct tda1004x_config medion_cardbus = { | |||
398 | .pll_sleep = philips_fmd1216_analog, | 398 | .pll_sleep = philips_fmd1216_analog, |
399 | .request_firmware = NULL, | 399 | .request_firmware = NULL, |
400 | }; | 400 | }; |
401 | #endif | ||
401 | 402 | ||
402 | /* ------------------------------------------------------------------ */ | 403 | /* ------------------------------------------------------------------ */ |
403 | 404 | ||
@@ -547,14 +548,14 @@ static int dvb_init(struct saa7134_dev *dev) | |||
547 | dev); | 548 | dev); |
548 | 549 | ||
549 | switch (dev->board) { | 550 | switch (dev->board) { |
550 | #if CONFIG_DVB_MT352 | 551 | #ifdef CONFIG_DVB_MT352 |
551 | case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL: | 552 | case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL: |
552 | printk("%s: pinnacle 300i dvb setup\n",dev->name); | 553 | printk("%s: pinnacle 300i dvb setup\n",dev->name); |
553 | dev->dvb.frontend = mt352_attach(&pinnacle_300i, | 554 | dev->dvb.frontend = mt352_attach(&pinnacle_300i, |
554 | &dev->i2c_adap); | 555 | &dev->i2c_adap); |
555 | break; | 556 | break; |
556 | #endif | 557 | #endif |
557 | #if CONFIG_DVB_TDA1004X | 558 | #ifdef CONFIG_DVB_TDA1004X |
558 | case SAA7134_BOARD_MD7134: | 559 | case SAA7134_BOARD_MD7134: |
559 | dev->dvb.frontend = tda10046_attach(&medion_cardbus, | 560 | dev->dvb.frontend = tda10046_attach(&medion_cardbus, |
560 | &dev->i2c_adap); | 561 | &dev->i2c_adap); |