diff options
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index de987444d..9a16be40b 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -7,9 +7,9 @@ ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352.h mt352.h ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/mt352_priv.h mt352_priv.h ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c cx22702.c ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.h cx22702.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.c lgdt3302.c -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302.h lgdt3302.h -ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt3302_priv.h lgdt3302_priv.h +ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.c lgdt330x.c +ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x.h lgdt330x.h +ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/lgdt330x_priv.h lgdt330x_priv.h ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.c or51132.c ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/or51132.h or51132.h ln -s ../dvb-kernel/linux/drivers/media/dvb/frontends/tda1004x.c tda1004x.c @@ -23,7 +23,7 @@ patch -p1 <<'DIFF' -obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o -obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o -+obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt3302.o mt352.o ++obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o +obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o # 2.6-only stuff @@ -32,7 +32,7 @@ patch -p1 <<'DIFF' endif inst_common := ir-common.ko -+inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt3302.ko or51132.ko tda1004x.ko ++inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko inst_video += video-buf.ko video-buf-dvb.ko @@ -54,7 +54,7 @@ diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c #include "compat.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#undef HAVE_LGDT3302 +-#undef HAVE_LGDT330X -#endif - #include "cx88.h" |