diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
| commit | 2054271bb008de0bcf0bdc5d6041613f616420f2 (patch) | |
| tree | 24e638944597399d28c0432a5f6a323d3181c8a6 /scripts/checkpatch.pl | |
| parent | 12480c2e53d355223cf6884ed1f56e6ac9b7c21f (diff) | |
| parent | 8757e168190a6ed2cd4aa23fc59bf86b0091b596 (diff) | |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup setting
+ Linux 3.7-rc6
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 21a9f5de0a21..f18750e3bd6c 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1890,8 +1890,10 @@ sub process { } if ($realfile =~ m@^(drivers/net/|net/)@ && - $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ && - $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) { + $rawline !~ m@^\+[ \t]*\*/[ \t]*$@ && #trailing */ + $rawline !~ m@^\+.*/\*.*\*/[ \t]*$@ && #inline /*...*/ + $rawline !~ m@^\+.*\*{2,}/[ \t]*$@ && #trailing **/ + $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) { #non blank */ WARN("NETWORKING_BLOCK_COMMENT_STYLE", "networking block comments put the trailing */ on a separate line\n" . $herecurr); } |