diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-10 15:43:32 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-10 15:43:32 -0700 |
| commit | f1ca2218881eee7a6f7c9659b837a4c412f8fd06 (patch) | |
| tree | d7a0c9fd32fcba2b523d55799533bc835d4c7ac9 /scripts | |
| parent | 68a531a1dec12708817552dad4eefc5968dd333f (diff) | |
| parent | dc7743aa3c49fabbc6dc9edbcf7df74d776ac32e (diff) | |
Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk
Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.
As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.
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 47016c304c84..66cad506b8a2 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/; } |