diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 11:11:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-19 11:11:16 -0300 |
| commit | 8bf2cc99d48eabe83872a51ceb427ea64cff7207 (patch) | |
| tree | 214200fa2cb8d56f69d407cade04d4a110ca3e5b /v4l/scripts | |
| parent | c7b8d03d39aaf7055bb88d7983839eaee56c62db (diff) | |
| parent | f40e092350ab797c7d40bb399d287a20a1f4f649 (diff) | |
| download | mediapointer-dvb-s2-8bf2cc99d48eabe83872a51ceb427ea64cff7207.tar.gz mediapointer-dvb-s2-8bf2cc99d48eabe83872a51ceb427ea64cff7207.tar.bz2 | |
merge: http://linuxtv.org/hg/~pb/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/gentree.pl | 24 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 7 |
2 files changed, 26 insertions, 5 deletions
diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index de91722a7..e58d410c2 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -79,6 +79,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef _COMPAT_H/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 0; + print STDERR "/* BP #if MM_KERNEL state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) { if ($1 eq ";") { print OUT "#if 0\n"; @@ -164,6 +172,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#ifndef.\s*I2C_PEC/) { chomp($line); $state{$level} = "if"; @@ -172,6 +188,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifdef.\s*I2C_PEC/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) { chomp($line); $state{$level} = "if"; diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index aebf2a950..04430ccf2 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -172,13 +172,10 @@ close OUT; if (($force_kconfig eq 1) || !open IN,".config") { open OUT,">.config"; - while ( my ($key, $value) = each(%depend) ) { - printf "CONFIG_%s=m\n",$key; - printf OUT "CONFIG_%s=m\n",$key; - } while ( my ($key,$value) = each(%tristate) ) { - if ($key eq "DVB_AV7110_FIRMWARE") { + if ( ($key eq "DVB_AV7110_FIRMWARE") || + ($key eq "DVB_CINERGYT2_TUNING") ) { printf OUT "CONFIG_%s=n\n",$key; } else { if ($value eq "tristate") { |