diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:20:03 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:21:21 +0200 |
commit | 87c35c56f4beed9e43bd41427643215655a31c3d (patch) | |
tree | a4a29370bbb16ecf1864751def0a9b7ad0629476 /scripts/checkpatch.pl | |
parent | d1ef5bd711b6b01e6a73cf186245d19939882706 (diff) | |
parent | ee9581d7adaeb2d04b01e3567e2355ceb5f43ad1 (diff) | |
download | talos-op-linux-87c35c56f4beed9e43bd41427643215655a31c3d.tar.gz talos-op-linux-87c35c56f4beed9e43bd41427643215655a31c3d.zip |
Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/newsoc
From: Linus Walleij <linus.walleij@linaro.org>:
Core support for the U9540 after finalized review
* 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (2 commits)
ARM: ux500: ioremap differences for DB9540
ARM: ux500: core U9540 support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'scripts/checkpatch.pl')
-rwxr-xr-x | scripts/checkpatch.pl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index de639eeeed50..faea0ec612bf 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1869,12 +1869,6 @@ sub process { "No space is necessary after a cast\n" . $hereprev); } - if ($rawline =~ /^\+[ \t]*\/\*[ \t]*$/ && - $prevrawline =~ /^\+[ \t]*$/) { - CHK("BLOCK_COMMENT_STYLE", - "Don't begin block comments with only a /* line, use /* comment...\n" . $hereprev); - } - # check for spaces at the beginning of a line. # Exceptions: # 1) within comments |