diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-19 11:27:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-19 11:27:28 -0300 |
| commit | 9000c5024269dbd6f01e6cab6d8eaeb9f90b240f (patch) | |
| tree | 1c93ab6550a3bd97f73dcbcec36b28024e3254e5 /v4l/scripts | |
| parent | cff8dc200a5b837ab3961fc7077c3125d65c2fb2 (diff) | |
| parent | ef8a1e833862b224fbe194505d8a619ad1b13b92 (diff) | |
| download | mediapointer-dvb-s2-9000c5024269dbd6f01e6cab6d8eaeb9f90b240f.tar.gz mediapointer-dvb-s2-9000c5024269dbd6f01e6cab6d8eaeb9f90b240f.tar.bz2 | |
Merge from http://linuxtv.org/hg/~mkrufky/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/cardlist | 2 | ||||
| -rwxr-xr-x | v4l/scripts/makelinks.sh | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index e368e6b4f..901d3fb18 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -1,6 +1,6 @@ #!/bin/sh -scripts/bttv.pl ../linux/drivers/media/video/bttv.h ../linux/drivers/media/video/bttv-cards.c \ +scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/media/video/bt8xx/bttv-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.bttv scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ 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 |