diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /scripts/kernel-doc | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
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 |