From c86403a556cc96458a1d52614322ec2eedc06a4e Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 9 Oct 2005 21:19:50 +0000 Subject: - don't symlink linux/include to v4l/ in merged-tree environment. Signed-off-by: Michael Krufky --- v4l/ChangeLog | 7 +++++++ v4l/Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'v4l') diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2ef9ab1d0..f06721d3f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-09 21:18 mkrufky + + * ../v4l/Makefile: + - don't symlink linux/include to v4l/ in merged-tree environment. + + Signed-off-by: Michael Krufky + 2005-10-09 21:04 mkrufky * ../v4l/scripts/merge-trees.sh: diff --git a/v4l/Makefile b/v4l/Makefile index 02eead390..c81c99c0c 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -171,7 +171,7 @@ links:: @find ../linux/kernel/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; # for merged-trees: - @find ../linux -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + @find ../linux/drivers -name '*.[c,h]' -type l -exec ln -sf '{}' . \; # @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \; -- cgit v1.2.3