4 files changed, 13 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f06721d3f..6c1275fa8 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-09 22:31  mkrufky
+
+	* ../v4l/Make.config:
+	- removed commented old code.
+
+	* ../v4l/scripts/merge-trees.sh:
+	* ../v4l/scripts/unmerge-trees.sh:
+	- fix Make.config offsets.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-10-09 21:18  mkrufky
 
 	* ../v4l/Makefile:
diff --git a/v4l/Make.config b/v4l/Make.config
index 3b3e69803..e880c3bd1 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -26,8 +26,6 @@ CONFIG_DVB_FRONTENDS    := n
 
 ifneq ($(KERNELRELEASE),)
 need_dvb := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo yes)
-#need_dvb := $(shell test $(PATCHLEVEL) -ge 6 && echo yes)
-#need_dvb := $(shell test $(SUBLEVEL) -lt 12 && echo no)
 endif
 
 ifeq ($(need_dvb),yes)
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