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.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index 8fa378a0d..2244ccfeb 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -79,3 +79,12 @@ 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) \
+@@ -254,7 +255,7 @@ rminstall::
+ rmmodules::
+ rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)
+
+-clean::
++clean:: unmerge-trees
+ find . -name '*.c' -type l -exec rm '{}' \;
+ find . -name '*.h' -type l -exec rm '{}' \;
+ -rm -f *~ *.o *.ko *.mod.c