summaryrefslogtreecommitdiff
path: root/v4l/scripts/unmerge-trees.sh
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-10-09 21:05:41 +0000
committerMichael Krufky <devnull@localhost>2005-10-09 21:05:41 +0000
commit81fe9575b54d31a96fb5c06d0e4da627ab37fb51 (patch)
tree7673cd2f231445d7306435e04d5417b111294c34 /v4l/scripts/unmerge-trees.sh
parent6576269d9ea448c3485dfc8168f32b1bd855f4fb (diff)
downloadmediapointer-dvb-s2-81fe9575b54d31a96fb5c06d0e4da627ab37fb51.tar.gz
mediapointer-dvb-s2-81fe9575b54d31a96fb5c06d0e4da627ab37fb51.tar.bz2
- fix fuzz & offsets.
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
-rw-r--r--v4l/scripts/unmerge-trees.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 98e1716e2..dfb45daec 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -29,16 +29,16 @@ 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)
-@@ -177,7 +176,7 @@ links::
+@@ -178,7 +177,7 @@ links::
- ln -sf ../linux/drivers/media/common/ir-common.c .
+ @ln -sf ../linux/drivers/media/common/ir-common.c .
-install:: rminstall dvb-install
+install:: rminstall
@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
@strip --strip-debug $(inst-m)
-@@ -237,7 +236,7 @@ dvb-rminstall::
+@@ -238,7 +237,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) \
-@@ -258,7 +257,7 @@ rminstall:: dvb-rminstall
+@@ -259,7 +258,7 @@ rminstall:: dvb-rminstall
rmmodules::
rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d)