diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-07-15 20:06:05 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-07-15 20:06:05 +0000 |
| commit | 3151532e6f6228fbc6076203542376525b890172 (patch) | |
| tree | 233b734c592c5204d369b90f438a956ea0c6e2af | |
| parent | c459e28d9ed3d54801ac47f874335889688981f8 (diff) | |
| download | mediapointer-dvb-s2-3151532e6f6228fbc6076203542376525b890172.tar.gz mediapointer-dvb-s2-3151532e6f6228fbc6076203542376525b890172.tar.bz2 | |
* cx88-dvb.c:
- Fix corrected.
Signed-off-by: Patrick Boettcher <patrick.boettcher@desy.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 14 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 15 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 0dae9ff6a..ae2170fa9 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.43 2005/07/15 12:40:23 mchehab Exp $ + * $Id: cx88-dvb.c,v 1.44 2005/07/15 20:06:05 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -166,18 +166,12 @@ static int mt352_pll_set(struct dvb_frontend* fe, static struct mt352_config dvico_fusionhdtv = { .demod_address = 0x0F, -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) - .output_mode = CX22702_SERIAL_OUTPUT, -#endif .demod_init = dvico_fusionhdtv_demod_init, .pll_set = mt352_pll_set, }; static struct mt352_config dntv_live_dvbt_config = { .demod_address = 0x0f, -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) - .output_mode = CX22702_SERIAL_OUTPUT, -#endif .demod_init = dntv_live_dvbt_demod_init, .pll_set = mt352_pll_set, }; @@ -186,12 +180,18 @@ static struct mt352_config dntv_live_dvbt_config = { #if CONFIG_DVB_CX22702 static struct cx22702_config connexant_refboard_config = { .demod_address = 0x43, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + .output_mode = CX22702_SERIAL_OUTPUT, +#endif .pll_address = 0x60, .pll_desc = &dvb_pll_thomson_dtt7579, }; static struct cx22702_config hauppauge_novat_config = { .demod_address = 0x43, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + .output_mode = CX22702_SERIAL_OUTPUT, +#endif .pll_address = 0x61, .pll_desc = &dvb_pll_thomson_dtt759x, }; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 8cc844620..9edf6f52d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-07-15 20:04 mchehab + + * cx88-dvb.c: + - Fix corrected. + + Signed-off-by: Patrick Boettcher <patrick.boettcher@desy.de> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-07-15 12:35 mchehab * cx88-dvb.c: - The output_mode needs to be set for the Hauppauge Nova-T DVB-T |