diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-17 15:43:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-17 15:43:51 -0300 |
| commit | acbc613601ba93f26adb3ba1d91aabeff718298b (patch) | |
| tree | b73b550f4b3c8eeb485d99fd8f729b5c054bcbf6 /v4l/scripts | |
| parent | 86cbc2b425cbc461fa8e02e45f0e55ee57f4bc6a (diff) | |
| download | mediapointer-dvb-s2-acbc613601ba93f26adb3ba1d91aabeff718298b.tar.gz mediapointer-dvb-s2-acbc613601ba93f26adb3ba1d91aabeff718298b.tar.bz2 | |
Fix compilation for Miropcm20 and Cinergy
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Miropcm compilation were assuming to compile under
linux/drivers/media/video, but this is not true when compiling in-tree.
Also, make allyesconfig were making "y" to an advanced configuration for
Cinergy.
gentree.pl also updated.
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 | 3 |
2 files changed, 26 insertions, 1 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..c4212d427 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -178,7 +178,8 @@ if (($force_kconfig eq 1) || !open IN,".config") { } 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") { |