diff options
| author | Michael Krufky <devnull@localhost> | 2005-08-31 03:55:55 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-08-31 03:55:55 +0000 |
| commit | c000782c9e1ae27ae9eb8a2ca43438b36e8cc684 (patch) | |
| tree | 1f905bdfc4052f769bd126219b7fbdb32a85a253 /v4l/scripts | |
| parent | a7b80e3c5047aeb5fc477265d4b06c90bf5a9961 (diff) | |
| download | mediapointer-dvb-s2-c000782c9e1ae27ae9eb8a2ca43438b36e8cc684.tar.gz mediapointer-dvb-s2-c000782c9e1ae27ae9eb8a2ca43438b36e8cc684.tar.bz2 | |
fixed fuzz and offset in saa7134-dvb merge
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 4 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index acc74e123..4fe91137f 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -130,8 +130,8 @@ diff -up video4linux.orig/cx88-dvb.c video4linux/cx88-dvb.c 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 -@@ -32,10 +32,6 @@ - #include <linux/config.h> +@@ -31,10 +31,6 @@ + #include <linux/suspend.h> #include "compat.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 583a5a77a..1275774d7 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -130,8 +130,8 @@ diff -up video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c 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 -@@ -32,6 +32,10 @@ - #include <linux/config.h> +@@ -31,6 +31,10 @@ + #include <linux/suspend.h> #include "compat.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) |