diff options
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index edc7c8a3a..a9ffa2b35 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -118,31 +118,3 @@ diff -up video4linux.orig/Makefile video4linux/Makefile $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null -diff -up video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c ---- video4linux.orig/cx88-dvb.c 2005-08-17 00:48:25.000000000 +0000 -+++ video4linux/cx88-dvb.c 2005-08-17 00:49:02.000000000 +0000 -@@ -31,10 +31,6 @@ - #include <linux/suspend.h> - #include "compat.h" - --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#undef HAVE_LGDT330X --#endif -- - #include "cx88.h" - #include "dvb-pll.h" - -diff -up 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 -@@ -31,10 +31,6 @@ - #include <linux/suspend.h> - #include "compat.h" - --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#undef HAVE_TDA1004X --#endif -- - #include "saa7134-reg.h" - #include "saa7134.h" - |