Merge from master

From: Hans Verkuil <hverkuil@xs4all.nl>



Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

1 files changed, 11 insertions, 11 deletions

diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh
index 44fa17759..a66989771 100755
--- a/v4l/scripts/makelinks.sh
+++ b/v4l/scripts/makelinks.sh
@@ -26,26 +26,26 @@ for x in `find include -type d | grep -v CVS` ; do
 done
 
 for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -v -f -s $PWD/$x $1/$x
+	ln -f -s $PWD/$x $1/$x
 done
 
 for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -v -f -s $PWD/$x $1/$x
+	ln -f -s $PWD/$x $1/$x
 done
 
 for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do
-	ln -v -f -s $PWD/$x $1/$x
+	ln -f -s $PWD/$x $1/$x
 done
 
-cd ..
+for x in `find include -type d | grep -v CVS` ; do
+	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
+done
 
-ln -v -f -s $PWD/v4l/compat.h $1/include/media/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/include/linux/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/common/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/bt8xx/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/cinergyT2/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/dvb-core/compat.h
-ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/video/compat.h
+for x in `find drivers/media -type d | grep -v CVS` ; do
+	ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h
+done
+
+cd ..
 patch -p0 <<'DIFF'
 diff -u -p videodev.h
 --- linux/include/linux/videodev.h