diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-11-12 09:09:01 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-11-12 09:09:01 -0500 |
| commit | 890ca861f868a10617029ffc87eae7d48ea6876c (patch) | |
| tree | 713383f4e3bbd94ddb9816a25e6b3911511908f1 /scripts/kernel-doc | |
| parent | 03452d27c6cd9cebb59a6bb0fb6bd8557916c263 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 1 |
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($$) { | |||
| 2085 | $prototype =~ s/^noinline +//; | 2085 | $prototype =~ s/^noinline +//; |
| 2086 | $prototype =~ s/__init +//; | 2086 | $prototype =~ s/__init +//; |
| 2087 | $prototype =~ s/__init_or_module +//; | 2087 | $prototype =~ s/__init_or_module +//; |
| 2088 | $prototype =~ s/__meminit +//; | ||
| 2088 | $prototype =~ s/__must_check +//; | 2089 | $prototype =~ s/__must_check +//; |
| 2089 | $prototype =~ s/__weak +//; | 2090 | $prototype =~ s/__weak +//; |
| 2090 | my $define = $prototype =~ s/^#\s*define\s+//; #ak added | 2091 | my $define = $prototype =~ s/^#\s*define\s+//; #ak added |