diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l/Makefile | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 071d4640d..f86dbd709 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,4 +1,13 @@ -2005-10-08 18:58 mkrufky +2005-10-08 23:10 mkrufky + + * ../v4l/Makefile: + - renamed tree-merge functions. new names: + make merge-trees + make unmerge-trees + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + +2005-10-08 22:58 mkrufky * ../linux/include/linux/videodev.h: - #include "compat.h" diff --git a/v4l/Makefile b/v4l/Makefile index 44023035d..9190f4fb6 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -198,10 +198,10 @@ v4l_install:: rminstall /sbin/depmod -a -merge: +merge-trees: @scripts/merge-trees.sh -unmerge: +unmerge-trees: @scripts/unmerge-trees.sh rminstall:: |