diff options
| -rw-r--r-- | linux/include/linux/videodev.h | 1 | ||||
| -rw-r--r-- | v4l/ChangeLog | 18 | ||||
| -rw-r--r-- | v4l/Makefile | 6 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 2 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 2 |
5 files changed, 27 insertions, 2 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index d2d8928ec..fbd964295 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -3,6 +3,7 @@ #include <linux/compiler.h> #include <linux/types.h> +#include "compat.h" #define HAVE_V4L2 1 #include <linux/videodev2.h> diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ac6105dd2..071d4640d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,21 @@ +2005-10-08 18:58 mkrufky + + * ../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 <mkrufky@m1k.net> + 2005-10-08 21:54 mkrufky * ../v4l/Makefile: diff --git a/v4l/Makefile b/v4l/Makefile index 7476c8287..44023035d 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -198,6 +198,12 @@ v4l_install:: rminstall /sbin/depmod -a +merge: + @scripts/merge-trees.sh + +unmerge: + @scripts/unmerge-trees.sh + rminstall:: @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." 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)) \ |