From a5b5eca82a89a9d85d806a722e9002b3a2c272fe Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Fri, 2 Dec 2005 22:08:07 +0000 Subject: Removed check for kernel version > 2.6.12 before setting output_mode for cx22702 - Removed check for kernel version > 2.6.12 before setting .output_mode for cx22702 - This is no longer needed for backwards compatability, due to the v4l-dvb merged cvs. Signed-off-by: Michael Krufky --- linux/drivers/media/video/cx88/cx88-dvb.c | 8 +------- v4l/ChangeLog | 10 ++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index f331297d7..62d6f29d7 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.75 2005/12/02 04:16:47 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.76 2005/12/02 22:08:07 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -182,26 +182,20 @@ static struct mt352_config dntv_live_dvbt_config = { #ifdef HAVE_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, }; static struct cx22702_config hauppauge_hvr1100_config = { .demod_address = 0x63, -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) .output_mode = CX22702_SERIAL_OUTPUT, -#endif .pll_address = 0x61, .pll_desc = &dvb_pll_fmd1216me, }; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 79f957518..7f5f50d01 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-12-02 22:04 mkrufky + + * ../linux/drivers/media/video/cx88/cx88-dvb.c: + - Removed check for kernel version > 2.6.12 before + setting .output_mode for cx22702 + - This is no longer needed for backwards compatability, + due to the v4l-dvb merged cvs. + + Signed-off-by: Michael Krufky + 2005-12-02 21:36 mkrufky * ../linux/drivers/media/video/cx88/cx88-i2c.c: -- cgit v1.2.3