- Previous commit broke tree-merge. Here is the correct fix.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

4 files changed, 19 insertions, 42 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e29ca7f7a..9f7322697 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-18 23:42  mkrufky
+
+	* ../v4l/Makefile:
+	* ../v4l/scripts/merge-trees.sh:
+	* ../v4l/scripts/unmerge-trees.sh:
+	- Previous commit broke tree-merge. Here is the correct fix.
+
+	Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
 2005-10-18 21:59  mkrufky
 
 	* ../v4l/Makefile:
diff --git a/v4l/Makefile b/v4l/Makefile
index cddc24e1f..909df59a9 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -177,7 +177,8 @@ links::
 	@find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \;
 
 #	for merged-trees:
-#	@find ../linux/drivers -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+	@find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
+	@find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \;
 
 #	@find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \;
 
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index ffff46bce..9ef965988 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -24,39 +24,6 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do
 	ln -f -s $DVB/$x $V4L/$x
 done
 
-ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.c         dvb-pll.c
-ln -s $V4L/drivers/media/dvb/frontends/dvb-pll.h         dvb-pll.h
-ln -s $V4L/drivers/media/dvb/frontends/mt352.c           mt352.c
-ln -s $V4L/drivers/media/dvb/frontends/mt352.h           mt352.h
-ln -s $V4L/drivers/media/dvb/frontends/mt352_priv.h      mt352_priv.h
-ln -s $V4L/drivers/media/dvb/frontends/cx22702.c         cx22702.c
-ln -s $V4L/drivers/media/dvb/frontends/cx22702.h         cx22702.h
-ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.c        lgdt330x.c
-ln -s $V4L/drivers/media/dvb/frontends/lgdt330x.h        lgdt330x.h
-ln -s $V4L/drivers/media/dvb/frontends/lgdt330x_priv.h   lgdt330x_priv.h
-ln -s $V4L/drivers/media/dvb/frontends/or51132.c         or51132.c
-ln -s $V4L/drivers/media/dvb/frontends/or51132.h         or51132.h
-ln -s $V4L/drivers/media/dvb/frontends/tda1004x.c        tda1004x.c
-ln -s $V4L/drivers/media/dvb/frontends/tda1004x.h        tda1004x.h
-ln -s $V4L/drivers/media/dvb/frontends/sp887x.c          sp887x.c
-ln -s $V4L/drivers/media/dvb/frontends/sp887x.h          sp887x.h
-ln -s $V4L/drivers/media/dvb/frontends/nxt6000.c         nxt6000.c
-ln -s $V4L/drivers/media/dvb/frontends/nxt6000.h         nxt6000.h
-ln -s $V4L/drivers/media/dvb/frontends/nxt6000_priv.h    nxt6000_priv.h
-ln -s $V4L/drivers/media/dvb/frontends/cx24110.c         cx24110.c
-ln -s $V4L/drivers/media/dvb/frontends/cx24110.h         cx24110.h
-ln -s $V4L/drivers/media/dvb/frontends/or51211.c         or51211.c
-ln -s $V4L/drivers/media/dvb/frontends/or51211.h         or51211.h
-ln -s $V4L/drivers/media/dvb/bt8xx/bt878.c               bt878.c
-ln -s $V4L/drivers/media/dvb/bt8xx/bt878.h               bt878.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.c           dvb-bt8xx.c
-ln -s $V4L/drivers/media/dvb/bt8xx/dvb-bt8xx.h           dvb-bt8xx.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dst.c                 dst.c
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.c              dst_ca.c
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_ca.h              dst_ca.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_common.h          dst_common.h
-ln -s $V4L/drivers/media/dvb/bt8xx/dst_priv.h            dst_priv.h
-
 cd $CWD
 patch -p2 <<'DIFF'
 diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
@@ -73,7 +40,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
-@@ -68,6 +68,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -69,6 +69,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -81,7 +48,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -182,7 +183,7 @@ links::
+@@ -184,7 +185,7 @@ links::
  
  	@ln -sf ../linux/drivers/media/common/ir-common.c .
  
@@ -90,7 +57,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -245,7 +246,7 @@ dvb-rminstall::
+@@ -247,7 +248,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
  	@echo
  
@@ -99,7 +66,7 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
  	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
  
  	-@rm -r $(DEST) \
-@@ -266,7 +267,7 @@ rminstall::
+@@ -268,7 +269,7 @@ rminstall::
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
  
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 6ea2826a4..ae5f60648 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -21,7 +21,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
-@@ -68,7 +68,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+@@ -69,7 +69,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -29,7 +29,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -183,7 +182,7 @@ links::
+@@ -185,7 +184,7 @@ links::
  
  	@ln -sf ../linux/drivers/media/common/ir-common.c .
  
@@ -38,7 +38,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
  	@strip --strip-debug $(inst-m)
-@@ -246,7 +245,7 @@ dvb-rminstall::
+@@ -248,7 +247,7 @@ dvb-rminstall::
  		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
  	@echo
  
@@ -47,7 +47,7 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
  	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
  
  	-@rm -r $(DEST) \
-@@ -267,7 +266,7 @@ rminstall:: dvb-rminstall
+@@ -269,7 +268,7 @@ rminstall:: dvb-rminstall
  rmmodules::
  	rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)