diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 16 | ||||
| -rw-r--r-- | v4l/Make.config | 13 | ||||
| -rw-r--r-- | v4l/scripts/cardlist | 3 | ||||
| -rw-r--r-- | v4l/vbi | 8 |
4 files changed, 25 insertions, 15 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 55292a1dc..cb534476f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2005-07-02 nshmyrev + * Make.config: + + - Fix check for newer kernel to compile dvb modules. + + * tea5767.c, tuner-core.c, tuner.h, tuner-simple.c, scripts/cardlist: + + - Cleanup code a bit + + * msp3400-old.c, vbi, tda9887.h: + + - Remove unused files + + Signed-Off-By: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-06-01 21:38 mchehab * tuner-core.c: @@ -62,7 +77,6 @@ Signed-Off-By: Michael Tokarev <mjt@tls.msk.ru> ->>>>>>> 1.109 2005-06-29 17:18 mchehab * tuner-core.c: diff --git a/v4l/Make.config b/v4l/Make.config index 221f4bcb4..9e642f557 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -8,10 +8,17 @@ CONFIG_VIDEO_TUNER := m CONFIG_VIDEO_TVAUDIO := m CONFIG_VIDEO_CX88 := m -# doesn't build on kernels older than 2.6.10 +# doesn't build on kernels older than 2.6.12 + CONFIG_VIDEO_CX88_DVB := n CONFIG_VIDEO_SAA7134_DVB := n -if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)) + +ifeq ($(SUBLEVEL),12) CONFIG_VIDEO_CX88_DVB := m -if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)) CONFIG_VIDEO_SAA7134_DVB := m +endif +ifeq ($(SUBLEVEL),13) + CONFIG_VIDEO_CX88_DVB := m + CONFIG_VIDEO_SAA7134_DVB := m +endif + diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index 8e13b75a1..33d6ad99e 100644 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -11,10 +11,7 @@ head -$LINE cx88-cards.c \ | perl -ne '/"([^"]+)"/; printf("card=%d - %s\n",$i++,$1)' \ | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.cx88 -TEA="`grep TEA5767_TUNER_NAME tuner.h|cut -d " " -f 3-`" - cat tuner-simple.c \ - | sed s/TEA5767_TUNER_NAME/"$TEA"/ \ | grep "{ \"" \ | perl -ne '/"([^"]+)"/; printf("tuner=%d - %s\n",$i++,$1)' \ | perl -ne 's/[ \t]+$//; print' > doc/CARDLIST.tuner diff --git a/v4l/vbi b/v4l/vbi deleted file mode 100644 index 1bb83bb56..000000000 --- a/v4l/vbi +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# config -vbi="/dev/vbi1" - -# go! -v4lctl -c "${vbi}" setnorm "pal-bg" -dd if="${vbi}" of=/dev/null bs=$(( 1024 * 64 )) count=1 |