diff options
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 35de4e76e..1d573b30b 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -70,33 +70,6 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c #include "cx88.h" #include "dvb-pll.h" -@@ -216,7 +212,7 @@ static struct or51132_config pchdtv_hd30 - #endif - - #ifdef HAVE_LGDT330X --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) -+#if 1 - static int lgdt330x_pll_set(struct dvb_frontend* fe, - struct dvb_frontend_parameters* params) - { -@@ -298,7 +294,7 @@ static int lgdt330x_set_ts_param(struct - - static struct lgdt330x_config fusionhdtv_3_gold = { - .demod_address = 0x0e, --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) -+#if 1 - .demod_chip = LGDT3302, - .serial_mpeg = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */ - .pll_set = lgdt330x_pll_set, -@@ -398,7 +394,7 @@ static int dvb_register(struct cx8802_de - &dev->core->i2c_adap); - } - break; --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) -+#if 1 - case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD: - dev->ts_gen_cntrl = 0x08; - { diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c --- video4linux.orig/saa7134-dvb.c 2005-08-17 00:48:25.000000000 +0000 +++ video4linux/saa7134-dvb.c 2005-08-17 00:49:02.000000000 +0000 |