diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 2 | ||||
| -rwxr-xr-x | v4l/scripts/make_config_compat.pl | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 0352fcd39..257143a6b 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -15,7 +15,7 @@ #endif /* To allow alsa code to work */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) +#ifdef NEED_SOUND_DRIVER_H #include <sound/driver.h> #endif diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index 785f9ff72..e538c925b 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -26,6 +26,25 @@ sub check_spin_lock() close INNET; } +sub check_sound_driver_h() +{ + my $file = "$kdir/include/sound/driver.h"; + my $old_syntax = 1; + + open INNET, "<$file" or return; + while (<INNET>) { + if (m/This file is deprecated/) { + $old_syntax = 0; + last; + } + } + + if ($old_syntax) { + $out.= "\n#define NEED_SOUND_DRIVER_H 1\n"; + } + close INNET; +} + sub check_snd_pcm_rate_to_rate_bit() { my $file = "$kdir/include/sound/pcm.h"; @@ -67,6 +86,7 @@ sub check_snd_ctl_boolean_mono_info() sub check_other_dependencies() { check_spin_lock(); + check_sound_driver_h(); check_snd_ctl_boolean_mono_info(); check_snd_pcm_rate_to_rate_bit(); } |