diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Kconfig.sound | 9 | ||||
| -rw-r--r-- | v4l/compat.h | 7 | ||||
| -rwxr-xr-x | v4l/scripts/check.pl | 4 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 13 | ||||
| -rwxr-xr-x | v4l/scripts/release.sh | 2 | ||||
| -rw-r--r-- | v4l/versions.txt | 4 |
6 files changed, 25 insertions, 14 deletions
diff --git a/v4l/Kconfig.sound b/v4l/Kconfig.sound index 55be75cce..67430b792 100644 --- a/v4l/Kconfig.sound +++ b/v4l/Kconfig.sound @@ -25,18 +25,9 @@ config SND_BT87X_OVERCLOCK Higher sample rates won't hurt your hardware, but audio quality may suffer. -config SND_FM801 - tristate - depends on SND && SND_OPL3_LIB && SND_MPU401_UART && SND_AC97_CODEC - -config SND_FM801_TEA575X_BOOL - bool - depends on SND_FM801 - config SND_FM801_TEA575X tristate "ForteMedia FM801 TEA5757 tuner" depends on VIDEO_V4L1 && SND_FM801 - select SND_FM801_TEA575X_BOOL help Say Y here to include support for soundcards based on the ForteMedia diff --git a/v4l/compat.h b/v4l/compat.h index 3df844c87..8e778d7f5 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -11,6 +11,7 @@ * delayed_work in the same context as something named work_struct. */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) #define delayed_work work_struct +#define INIT_DELAYED_WORK(a,b,c) INIT_WORK(a,b,c) #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) @@ -238,6 +239,12 @@ static inline int list_is_singular(const struct list_head *head) min_t( __typeof__( x ), \ ( h ), \ ( x ) ) ) +#define clamp_val(val, min, max) ({ \ + typeof(val) __val = (val); \ + typeof(val) __min = (min); \ + typeof(val) __max = (max); \ + __val = __val < __min ? __min : __val; \ + __val > __max ? __max : __val; }) #endif #ifdef NEED_ALGO_CONTROL diff --git a/v4l/scripts/check.pl b/v4l/scripts/check.pl index 4958e281b..975041c4a 100755 --- a/v4l/scripts/check.pl +++ b/v4l/scripts/check.pl @@ -87,6 +87,10 @@ $pwd =~ s|/[^/]+\n$||; sub print_err() { + if ($err =~ m/LINUX_VERSION_CODE/) { + return; + } + if ($err) { printf STDERR "%s/%s: In '%s':\n", $pwd, $file, $errline; printf STDERR "%s/%s:%d: %s\n", $pwd, $file, $ln_numb, $err; diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 57c663c00..8683ee4d8 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -277,11 +277,13 @@ sub open_kconfig($$) { my $in_help = 0; my $default_seen = 0; my $if; + my $line; print "Opening $file\n" if $debug; open $in, '<', $file or die "File not found: $file"; push @kconfigfiles, $file; while (<$in>) { + $line = $_; # In our Kconfig files, the first non-help line after the # help text always has no indention. Technically, the # help text is ended by just by the indention decreasing, @@ -303,7 +305,7 @@ sub open_kconfig($$) { print OUT "\tdefault n\n"; } print OUT "\tdepends on VIDEO_KERNEL_VERSION\n"; - $_ = sprintf($disabled_msg, $minver{$key}); + $line = sprintf($disabled_msg, $minver{$key}); } next; } @@ -319,10 +321,13 @@ sub open_kconfig($$) { } next if (/^\s*#/ || /^\s*$/); # skip comments and blank lines + # Erase any comments on this line + s/(?<!\\)#(.*)$//; + if (m|^\s*source\s+"([^"]+)"\s*$| || m|^\s*source\s+(\S+)\s*$|) { open_kconfig($dir, "$dir/$1"); - $_ = ''; # don't print the source line itself + $line = ''; # don't print the source line itself next; } @@ -453,13 +458,13 @@ sub open_kconfig($$) { if ($disabled) { $default_seen = 1; - $_ = "\tdefault n\n"; + $line = "\tdefault n\n"; } } else { print "Skipping $file:$. $_" if $debug; } } continue { - print OUT $_; + print OUT $line; } close $in; } diff --git a/v4l/scripts/release.sh b/v4l/scripts/release.sh index 5055675d6..19916545c 100755 --- a/v4l/scripts/release.sh +++ b/v4l/scripts/release.sh @@ -14,7 +14,7 @@ files_common="$files_v4l $files_tuner $files_i2c doc" # other files files_ir="ir-common.[ch]" -files_audio="msp3400.[ch] tvaudio.[ch] tvmixer.[ch]" +files_audio="msp3400.[ch] tvaudio.[ch]" files_bttv="bt848.h btcx*.[ch] bttv*.[ch] ir-kbd*.c" files_saa="saa7134*.[ch] saa6752hs.[ch] ir-kbd-i2c.c" diff --git a/v4l/versions.txt b/v4l/versions.txt index 369cbb15d..b4869a157 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -20,6 +20,10 @@ SOC_CAMERA SOC_CAMERA_MT9V022 SOC_CAMERA_MT9M001 +[2.6.23] +# Needs field intf_assoc in struct usb_host_config +VIDEO_CX231XX + [2.6.22] #This driver requires I2C probe/remove fields VIDEO_TCM825X |