summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-06-01 20:15:26 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-06-01 20:15:26 -0300
commit8391e4a8e4148d94a9eaecf3fbd242d959ace901 (patch)
tree05c4c2058674fa2b75f6f1fd9f80ad28650a6b89 /v4l
parent1774b82f8341f6d5e8bdb5933f5fd6e2cca2aa15 (diff)
downloadmediapointer-dvb-s2-8391e4a8e4148d94a9eaecf3fbd242d959ace901.tar.gz
mediapointer-dvb-s2-8391e4a8e4148d94a9eaecf3fbd242d959ace901.tar.bz2
saa7134-tvaudio: kthread conversion
From: Christoph Hellwig <hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile17
-rwxr-xr-xv4l/scripts/gentree.pl5
2 files changed, 6 insertions, 16 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index ad499751d..954d5227e 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -238,21 +238,8 @@ links::
oss:
ln -sf . oss
-config-compat.h:: .myconfig
- @perl \
- -e 'print "#ifndef __CONFIG_COMPAT_H__\n";' \
- -e 'print "#define __CONFIG_COMPAT_H__\n\n";' \
- -e 'print "#include <linux/autoconf.h>\n\n";' \
- -e 'while(<>) {' \
- -e ' next unless /^(\S+)\s*:= (\S+)$$/;' \
- -e ' print "#undef $$1\n";' \
- -e ' print "#undef $$1_MODULE\n";' \
- -e ' if($$2 eq "n") { next; }' \
- -e ' elsif($$2 eq "m") { print "#define $$1_MODULE 1\n"; }' \
- -e ' elsif($$2 eq "y") { print "#define $$1 1\n"; }' \
- -e ' else { print "#define $$1 $$2\n"; }' \
- -e '} print "\n#endif\n";' \
- < .myconfig > config-compat.h
+config-compat.h:: $(obj)/.version .myconfig
+ perl scripts/make_config_compat.pl $(KDIR) $(obj)/.myconfig $(obj)/config-compat.h
kernel-links makelinks::
cd ..; v4l/scripts/makelinks.sh $(KDIR)
diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl
index f9f56bd7c..08969dab3 100755
--- a/v4l/scripts/gentree.pl
+++ b/v4l/scripts/gentree.pl
@@ -64,7 +64,10 @@ my %defs = (
'CONFIG_XC3028' => 0,
'CONFIG_TUNER_TEA5761' => 0,
'I2C_CLASS_TV_ANALOG' => 1,
- 'I2C_CLASS_TV_DIGITAL' => 1);
+ 'I2C_CLASS_TV_DIGITAL' => 1,
+ 'OLD_XMIT_LOCK' => 0,
+ 'CONFIG_VIVI_SCATTER' => 0,
+);
#################################################################
# helpers