diff options
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 4 |
1 files changed, 2 insertions, 2 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 |