diff options
| author | Michael Krufky <devnull@localhost> | 2005-09-21 00:56:30 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-09-21 00:56:30 +0000 |
| commit | ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672 (patch) | |
| tree | 44d136b157c6fd1aaa2b56e2e7656bdefa0a97d1 /v4l/scripts | |
| parent | cc332c813f85647f7cdd57a25a2516b56971d3b0 (diff) | |
| download | mediapointer-dvb-s2-ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672.tar.gz mediapointer-dvb-s2-ecf4d8a4c5cc6aa74cbbd62924750c0d46b6e672.tar.bz2 | |
* compat.h:
* cx88-dvb.c:
* saa7134-dvb.c:
* scripts/merge-trees.sh:
* scripts/unmerge-trees.sh:
- move some #if kernel version into compat.h
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 28 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 28 |
2 files changed, 0 insertions, 56 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" - diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 6458cd0e8..bd5b0ee2c 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -118,31 +118,3 @@ diff -up video4linux/Makefile video4linux.orig/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/cx88-dvb.c video4linux.orig/cx88-dvb.c ---- video4linux/cx88-dvb.c 2005-08-17 00:49:02.000000000 +0000 -+++ video4linux.orig/cx88-dvb.c 2005-08-17 00:48:25.000000000 +0000 -@@ -31,6 +31,10 @@ - #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/saa7134-dvb.c video4linux.orig/saa7134-dvb.c ---- video4linux/saa7134-dvb.c 2005-08-17 00:49:02.000000000 +0000 -+++ video4linux.orig/saa7134-dvb.c 2005-08-17 00:48:25.000000000 +0000 -@@ -31,6 +31,10 @@ - #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" - |