diff options
| -rw-r--r-- | linux/drivers/media/radio/miropcm20-radio.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/radio/miropcm20-rds-core.c | 4 | ||||
| -rwxr-xr-x | v4l/scripts/gentree.pl | 24 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 3 |
4 files changed, 34 insertions, 1 deletions
diff --git a/linux/drivers/media/radio/miropcm20-radio.c b/linux/drivers/media/radio/miropcm20-radio.c index ec8b16e8f..1a625e24c 100644 --- a/linux/drivers/media/radio/miropcm20-radio.c +++ b/linux/drivers/media/radio/miropcm20-radio.c @@ -23,7 +23,11 @@ #include <linux/init.h> #include "compat.h" #include <linux/videodev.h> +#ifdef _COMPAT_H +#include "../sound/oss/aci.h" +#else #include "../../../sound/oss/aci.h" +#endif #include "miropcm20-rds-core.h" static int radio_nr = -1; diff --git a/linux/drivers/media/radio/miropcm20-rds-core.c b/linux/drivers/media/radio/miropcm20-rds-core.c index 3f5aaf5fa..a9972dfc1 100644 --- a/linux/drivers/media/radio/miropcm20-rds-core.c +++ b/linux/drivers/media/radio/miropcm20-rds-core.c @@ -24,7 +24,11 @@ #endif #include <asm/io.h> +#ifdef _COMPAT_H +#include "../sound/oss/aci.h" +#else #include "../../../sound/oss/aci.h" +#endif #include "miropcm20-rds-core.h" #define DEBUG 0 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") { |