summaryrefslogtreecommitdiff
path: root/v4l/scripts/merge-trees.sh
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/scripts/merge-trees.sh')
-rw-r--r--v4l/scripts/merge-trees.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index c41f8eba8..e823ce2e9 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -55,7 +55,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)
-@@ -241,7 +242,7 @@ dvb-rminstall::
+@@ -240,7 +241,7 @@ dvb-rminstall::
$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
@echo
@@ -64,7 +64,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) \
-@@ -262,7 +263,7 @@ rminstall::
+@@ -261,7 +262,7 @@ rminstall::
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)