diff options
| author | Michael Krufky <devnull@localhost> | 2005-10-08 23:06:20 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-10-08 23:06:20 +0000 |
| commit | c2b31dd160679b4bdb7d10896804fc3110114c4b (patch) | |
| tree | 3c82f135e295986a5fde1f4b9acca407a5c40e26 /linux | |
| parent | d5855ee13eb06ce1509ee1610d1af0e0c10debaa (diff) | |
| download | mediapointer-dvb-s2-c2b31dd160679b4bdb7d10896804fc3110114c4b.tar.gz mediapointer-dvb-s2-c2b31dd160679b4bdb7d10896804fc3110114c4b.tar.bz2 | |
* ../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>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/include/linux/videodev.h | 1 |
1 files changed, 1 insertions, 0 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> |