diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-09 18:24:02 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-09 18:24:02 +0000 |
| commit | c430753e7672a73576d5e7d54fb35844973ab201 (patch) | |
| tree | b877756a8e6f48331e488058e9eb0bc6bcdacb0d /v4l/scripts | |
| parent | 1c769dacd06c44528955753c2cac21b1d4b8ddef (diff) | |
| download | mediapointer-dvb-s2-c430753e7672a73576d5e7d54fb35844973ab201.tar.gz mediapointer-dvb-s2-c430753e7672a73576d5e7d54fb35844973ab201.tar.bz2 | |
fix offsets
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 d1921c763..a2958c364 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -66,7 +66,7 @@ patch -p2 <<'DIFF' diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config --- v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400 +++ v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400 -@@ -31,5 +31,7 @@ endif +@@ -32,5 +32,7 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -77,7 +77,7 @@ diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile --- v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400 +++ v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400 -@@ -69,6 +69,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -66,6 +66,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 5bb2ea45d..75cfbb0e2 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -47,7 +47,7 @@ patch -p2 <<'DIFF' diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config --- v4l-kernel/v4l/Make.config 2005-10-08 17:46:08.000000000 -0400 +++ v4l-kernel.orig/v4l/Make.config 2005-10-08 17:31:57.000000000 -0400 -@@ -31,7 +31,5 @@ endif +@@ -32,7 +32,5 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m @@ -58,7 +58,7 @@ diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile --- v4l-kernel/v4l/Makefile 2005-10-08 17:45:48.000000000 -0400 +++ v4l-kernel.orig/v4l/Makefile 2005-10-08 17:31:57.000000000 -0400 -@@ -69,7 +69,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -66,7 +66,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) endif # for DVB |