summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/scripts')
-rwxr-xr-xv4l/scripts/checkpatch.pl4
-rwxr-xr-xv4l/scripts/make_kconfig.pl3
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();