summaryrefslogtreecommitdiff
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-09-04 03:01:36 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-09-04 03:01:36 +0400
commit516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch)
treeff37e84692dbef5063bbf22672eb8bfad0f25dd8 /scripts/kernel-doc
parent6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff)
parent69e273c0b0a3c337a521d083374c918dc52c666f (diff)
downloadlinux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.tar.xz
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 16a07cfa4d34..70bea942b413 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2085,6 +2085,7 @@ sub dump_function($$) {
$prototype =~ s/^noinline +//;
$prototype =~ s/__init +//;
$prototype =~ s/__init_or_module +//;
+ $prototype =~ s/__meminit +//;
$prototype =~ s/__must_check +//;
$prototype =~ s/__weak +//;
my $define = $prototype =~ s/^#\s*define\s+//; #ak added