diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-25 05:10:13 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-25 05:10:13 +0000 |
| commit | 5581913858d7f90510d66940102104f7be5a5d53 (patch) | |
| tree | 22e80400008ae03aa81eb398e318e02c4b5c6cab /v4l/scripts/unmerge-trees.sh | |
| parent | 9d651997deca1edaaf6be6ab1cc0053058dcba2c (diff) | |
| download | mediapointer-dvb-s2-5581913858d7f90510d66940102104f7be5a5d53.tar.gz mediapointer-dvb-s2-5581913858d7f90510d66940102104f7be5a5d53.tar.bz2 | |
Rename lgdt3302 to lgdt330x.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 49f22b3a0..2ea436e6a 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -7,9 +7,9 @@ rm mt352.h rm mt352_priv.h rm cx22702.c rm cx22702.h -rm lgdt3302.c -rm lgdt3302.h -rm lgdt3302_priv.h +rm lgdt330x.c +rm lgdt330x.h +rm lgdt330x_priv.h rm or51132.c rm or51132.h rm tda1004x.c @@ -23,7 +23,7 @@ video4linux.orig/Makefile obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.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 +obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o +obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o @@ -34,7 +34,7 @@ video4linux.orig/Makefile 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 @@ -56,7 +56,7 @@ diff -upr video4linux/cx88-dvb.c video4linux.orig/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" |