diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-30 12:06:40 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-30 12:35:30 +0200 |
| commit | 2f09e45960dd19e51d29356e66540ea38ee37bff (patch) | |
| tree | fbba22b7a74d7a3b6f63a887307b53a6ea95c576 /scripts | |
| parent | 9fbf8c26dddf0ca11c79d5476de6045c6db8199a (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | kernel_goldelico_gta04-2f09e45960dd19e51d29356e66540ea38ee37bff.zip kernel_goldelico_gta04-2f09e45960dd19e51d29356e66540ea38ee37bff.tar.gz kernel_goldelico_gta04-2f09e45960dd19e51d29356e66540ea38ee37bff.tar.bz2 | |
Merge remote-tracking branch 'linus/master' (3.12-rc3) into 3.12-wip
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 47016c3..66cad50 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3975,8 +3975,8 @@ sub string_find_replace { # check for new externs in .h files. if ($realfile =~ /\.h$/ && $line =~ /^\+\s*(extern\s+)$Type\s*$Ident\s*\(/s) { - if (WARN("AVOID_EXTERNS", - "extern prototypes should be avoided in .h files\n" . $herecurr) && + if (CHK("AVOID_EXTERNS", + "extern prototypes should be avoided in .h files\n" . $herecurr) && $fix) { $fixed[$linenr - 1] =~ s/(.*)\bextern\b\s*(.*)/$1$2/; } |