diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-04 16:05:50 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-04 16:05:50 +0000 |
| commit | a71b3c7a0123e24856b0b3c4ae284b6f4f2c13dd (patch) | |
| tree | 6019ef505a40136289328c99ca89a1c519921a19 | |
| parent | cf01451d7160c8c93edc5fbbfaadf2fbe1818faa (diff) | |
| download | mediapointer-dvb-s2-a71b3c7a0123e24856b0b3c4ae284b6f4f2c13dd.tar.gz mediapointer-dvb-s2-a71b3c7a0123e24856b0b3c4ae284b6f4f2c13dd.tar.bz2 | |
* Makefile, saa7134-dvb.c:
- Let Kconfig decide whether to include
frontend-specific code in saa7134-dvb.
* cx88-video.c:
- added missing contrast offset value, set to 0.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 20 | ||||
| -rw-r--r-- | v4l/ChangeLog | 13 | ||||
| -rw-r--r-- | v4l/Makefile | 4 |
4 files changed, 34 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index fd744d712..350e63db7 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.75 2005/07/03 18:29:45 mchehab Exp $ + * $Id: cx88-video.c,v 1.76 2005/07/04 16:05:50 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -255,6 +255,7 @@ static struct cx88_ctrl cx8800_ctls[] = { .default_value = 0, .type = V4L2_CTRL_TYPE_INTEGER, }, + .off = 0, .reg = MO_CONTR_BRIGHT, .mask = 0xff00, .shift = 8, diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 16b1e82c6..3959a5714 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-dvb.c,v 1.17 2005/06/28 23:41:47 mkrufky Exp $ + * $Id: saa7134-dvb.c,v 1.18 2005/07/04 16:05:50 mkrufky Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -33,9 +33,13 @@ #include "saa7134-reg.h" #include "saa7134.h" -#include "mt352.h" -#include "mt352_priv.h" /* FIXME */ -#include "tda1004x.h" +#if CONFIG_DVB_MT352 +# include "mt352.h" +# include "mt352_priv.h" /* FIXME */ +#endif +#if CONFIG_DVB_TDA1004X +# include "tda1004x.h" +#endif MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); MODULE_LICENSE("GPL"); @@ -47,6 +51,7 @@ MODULE_PARM_DESC(antenna_pwr,"enable antenna power (Pinnacle 300i)"); /* ------------------------------------------------------------------ */ +#if CONFIG_DVB_MT352 static int pinnacle_antenna_pwr(struct saa7134_dev *dev, int on) { u32 ok; @@ -141,9 +146,11 @@ static struct mt352_config pinnacle_300i = { .demod_init = mt352_pinnacle_init, .pll_set = mt352_pinnacle_pll_set, }; +#endif /* ------------------------------------------------------------------ */ +#if CONFIG_DVB_TDA1004X static int philips_tu1216_pll_init(struct dvb_frontend *fe) { struct saa7134_dev *dev = fe->dvb->priv; @@ -519,6 +526,7 @@ static struct tda1004x_config tda827x_lifeview_config = { .pll_sleep = philips_tda827x_pll_sleep, .request_firmware = NULL, }; +#endif /* ------------------------------------------------------------------ */ @@ -536,11 +544,14 @@ static int dvb_init(struct saa7134_dev *dev) dev); switch (dev->board) { +#if CONFIG_DVB_MT352 case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL: printk("%s: pinnacle 300i dvb setup\n",dev->name); dev->dvb.frontend = mt352_attach(&pinnacle_300i, &dev->i2c_adap); break; +#endif +#if CONFIG_DVB_TDA1004X case SAA7134_BOARD_MD7134: dev->dvb.frontend = tda10046_attach(&medion_cardbus, &dev->i2c_adap); @@ -557,6 +568,7 @@ static int dvb_init(struct saa7134_dev *dev) dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config, &dev->i2c_adap); break; +#endif default: printk("%s: Huh? unknown DVB card?\n",dev->name); break; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b74c0f9cc..db95c4fdc 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,6 +1,17 @@ +2005-07-04 11:47 mkrufky + * Makefile, saa7134-dvb.c: + - Let Kconfig decide whether to include + frontend-specific code in saa7134-dvb. + + * cx88-video.c: + - added missing contrast offset value, set to 0. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-03 21:11 mkrufky * Makefile, cx88-dvb.c: - - Let Kconfig decide whether to include frontend-specific code. + - Let Kconfig decide whether to include + frontend-specific code in cx88-dvb. Signed-off-by: Michael Krufky <mkrufky@m1k.net> diff --git a/v4l/Makefile b/v4l/Makefile index e2e705c89..d4ee58c1e 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -63,6 +63,10 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) EXTRA_CFLAGS += -DCONFIG_DVB_LGDT3302=1 EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1 endif +ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m) + EXTRA_CFLAGS += -DCONFIG_DVB_MT352=1 + EXTRA_CFLAGS += -DCONFIG_DVB_TDA1004X=1 +endif ################################################# # compile modules |