summaryrefslogtreecommitdiff
path: root/v4l/scripts/unmerge-trees.sh
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
-rw-r--r--v4l/scripts/unmerge-trees.sh2
1 files changed, 1 insertions, 1 deletions
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