From c2b31dd160679b4bdb7d10896804fc3110114c4b Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 8 Oct 2005 23:06:20 +0000 Subject: * ../linux/include/linux/videodev.h: - #include "compat.h" * ../v4l/Makefile: - add two new make commands for tree-merge: make merge make unmerge - this allows tree-merge commands to be called from both top-level v4l-kernel and v4l-kernel/v4l * ../v4l/scripts/merge-trees.sh: * ../v4l/scripts/unmerge-trees.sh: - fix offsets Signed-off-by: Michael Krufky --- v4l/scripts/merge-trees.sh | 2 +- v4l/scripts/unmerge-trees.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index ffdfe25d9..d422b319a 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -104,7 +104,7 @@ diff -up video4linux.orig/Makefile video4linux/Makefile -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video -@@ -204,12 +216,14 @@ rminstall:: +@@ -210,12 +222,14 @@ rminstall:: -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index aac6575db..12cb25893 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -104,7 +104,7 @@ diff -up video4linux/Makefile video4linux.orig/Makefile -install -d $(KDIR26)/video -install -m 644 -c $(inst_video) $(KDIR26)/video -@@ -216,14 +204,12 @@ rminstall:: +@@ -222,14 +210,12 @@ rminstall:: -@rm -r $(DEST) \ $(addprefix $(KDIR26)/common/, $(inst_common)) \ $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ -- cgit v1.2.3