diff options
Diffstat (limited to 'v4l/scripts')
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 2 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 1b9fe0bb3..aa8aa97b9 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -27,7 +27,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 -@@ -33,5 +33,7 @@ endif +@@ -31,5 +31,7 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index dfb45daec..9d8bd69bf 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -10,7 +10,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 -@@ -33,7 +33,5 @@ endif +@@ -31,7 +31,5 @@ endif ifeq ($(need_dvb),yes) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m |