diff options
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 90021bed0..fbc9fa564 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -47,32 +47,30 @@ patch -p1 <<'DIFF' -install -m 644 -c $(inst_video) $(KDIR26)/video diff -upr video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c ---- video4linux.orig/cx88-dvb.c 2005-07-21 23:35:26.000000000 +0000 -+++ video4linux/cx88-dvb.c 2005-07-21 23:35:52.000000000 +0000 -@@ -34,11 +34,7 @@ - #define CONFIG_DVB_MT352 1 - #define CONFIG_DVB_CX22702 1 - #define CONFIG_DVB_OR51132 1 +--- video4linux.orig/cx88-dvb.c 2005-07-23 05:35:09.000000000 +0000 ++++ video4linux/cx88-dvb.c 2005-07-23 05:36:30.000000000 +0000 +@@ -32,10 +32,6 @@ + #include <linux/config.h> + #include "compat.h" + -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --#define CONFIG_DVB_LGDT3302 0 --#else - #define CONFIG_DVB_LGDT3302 1 +-#undef CONFIG_DVB_LGDT3302 -#endif - +- #include "cx88.h" #include "dvb-pll.h" + diff -upr video4linux.orig/saa7134-dvb.c video4linux/saa7134-dvb.c ---- video4linux.orig/saa7134-dvb.c 2005-07-21 23:35:26.000000000 +0000 -+++ video4linux/saa7134-dvb.c 2005-07-21 23:36:19.000000000 +0000 -@@ -32,11 +32,7 @@ +--- video4linux.orig/saa7134-dvb.c 2005-07-23 05:35:09.000000000 +0000 ++++ video4linux/saa7134-dvb.c 2005-07-23 05:36:50.000000000 +0000 +@@ -32,10 +32,6 @@ + #include <linux/config.h> #include "compat.h" - #define CONFIG_DVB_MT352 1 --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) - #define CONFIG_DVB_TDA1004X 1 --#else --#define CONFIG_DVB_TDA1004X 0 +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +-#undef CONFIG_DVB_TDA1004X -#endif +- #include "saa7134-reg.h" #include "saa7134.h" |