diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 12:17:17 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-18 12:17:17 -0500 |
| commit | cbf50a4125f5242dd70b1f2342dbba2d94c6d94e (patch) | |
| tree | a97a067e53f32e246034fbbb07e2c0894c279391 /scripts/kernel-doc | |
| parent | 7a8ea7ebe4cf698918e7d3c860587e815eaa0f28 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge 3.8-rc4 into usb-next
This pulls in all of the -rc4 fixes into usb-next to sync things up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 28b761567815..f565536a2bef 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -2079,7 +2079,6 @@ sub dump_function($$) { | |||
| 2079 | $prototype =~ s/^__inline +//; | 2079 | $prototype =~ s/^__inline +//; |
| 2080 | $prototype =~ s/^__always_inline +//; | 2080 | $prototype =~ s/^__always_inline +//; |
| 2081 | $prototype =~ s/^noinline +//; | 2081 | $prototype =~ s/^noinline +//; |
| 2082 | $prototype =~ s/__devinit +//; | ||
| 2083 | $prototype =~ s/__init +//; | 2082 | $prototype =~ s/__init +//; |
| 2084 | $prototype =~ s/__init_or_module +//; | 2083 | $prototype =~ s/__init_or_module +//; |
| 2085 | $prototype =~ s/__must_check +//; | 2084 | $prototype =~ s/__must_check +//; |