diff options
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 702ddb165..6ea2826a4 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 -@@ -66,7 +66,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6) +@@ -68,7 +68,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) -@@ -181,7 +180,7 @@ links:: +@@ -183,7 +182,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) -@@ -244,7 +243,7 @@ dvb-rminstall:: +@@ -246,7 +245,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) \ -@@ -265,7 +264,7 @@ rminstall:: dvb-rminstall +@@ -267,7 +266,7 @@ rminstall:: dvb-rminstall rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) |