diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-08-23 08:43:33 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-08-23 08:43:33 +0200 |
| commit | e7e0275a6146c377a318ea69ba83532b2ecf4080 (patch) | |
| tree | 908890d5dfd5a4e4575c4f3c74031350d4402317 /v4l/scripts | |
| parent | 2019504e7d4a9558886c6327b9f6c684e9f5b252 (diff) | |
| parent | ab19cb308e86c5aeb0531bbbf5bfb2c09d3423a3 (diff) | |
| download | mediapointer-dvb-s2-e7e0275a6146c377a318ea69ba83532b2ecf4080.tar.gz mediapointer-dvb-s2-e7e0275a6146c377a318ea69ba83532b2ecf4080.tar.bz2 | |
merge: from v4l-dvb
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/checkpatch.pl | 4 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/v4l/scripts/checkpatch.pl b/v4l/scripts/checkpatch.pl index bc6779398..a4f512753 100755 --- a/v4l/scripts/checkpatch.pl +++ b/v4l/scripts/checkpatch.pl @@ -1686,13 +1686,13 @@ sub process { ($op eq '>' && $ca =~ /<\S+\@\S+$/)) { - $ok = 1; + $ok = 1; } # Ignore ?: if (($opv eq ':O' && $ca =~ /\?$/) || ($op eq '?' && $cc =~ /^:/)) { - $ok = 1; + $ok = 1; } if ($ok == 0) { diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index ee649f574..20b94f0c1 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -583,9 +583,6 @@ disable_config('DVB_CINERGYT2_TUNING'); disable_config('DVB_FE_CUSTOMISE'); disable_config('VIDEO_HELPER_CHIPS_AUTO'); -# ACI needs some kernel includes that might not be there -disable_config('SOUND_ACI_MIXER') if (! -e "$kernsrc/sound/oss/sound_config.h"); - # Check dependencies my %newconfig = checkdeps(); |