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 /v4l/Makefile | |
| 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 'v4l/Makefile')
| -rw-r--r-- | v4l/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
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).." |