diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 13:08:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 13:08:08 -0500 |
| commit | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (patch) | |
| tree | d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76 /scripts/kernel-doc | |
| parent | 4f57d865f1d863346ac50db9c25859e73a86499c (diff) | |
| parent | b4d20859362fde976bb2fa53eb51b798cdba1afc (diff) | |
Merge branch 'kernel-doc' from Randy Dunlap
The usual kernel-doc fixups from Randy. Some of them David acked as
merged in his tree, this is the random left-overs.
* kernel-doc:
docbook: fix sched source file names in device-drivers book
docbook: change iomap source filename in deviceiobook
docbook: don't use serial_core.h in device-drivers book
kernel-doc: fix kernel-doc warnings in sched
kernel-doc: fix new warnings in cfg80211.h
kernel-doc: fix new warning in usb.h
kernel-doc: fix new warnings in device.h
kernel-doc: fix new warnings in debugfs
kernel-doc: fix new warning in regulator core
kernel-doc: fix new warnings in pci
kernel-doc: fix new warnings in driver-core
kernel-doc: fix new warnings in auditsc.c
scripts/kernel-doc: fix fatal error caused by cfg80211.h
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index d793001929cf..9b0c0b8b4ab4 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -5,7 +5,7 @@ use strict; | |||
| 5 | ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## | 5 | ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## |
| 6 | ## Copyright (C) 2000, 1 Tim Waugh <twaugh@redhat.com> ## | 6 | ## Copyright (C) 2000, 1 Tim Waugh <twaugh@redhat.com> ## |
| 7 | ## Copyright (C) 2001 Simon Huggins ## | 7 | ## Copyright (C) 2001 Simon Huggins ## |
| 8 | ## Copyright (C) 2005-2010 Randy Dunlap ## | 8 | ## Copyright (C) 2005-2012 Randy Dunlap ## |
| 9 | ## ## | 9 | ## ## |
| 10 | ## #define enhancements by Armin Kuster <akuster@mvista.com> ## | 10 | ## #define enhancements by Armin Kuster <akuster@mvista.com> ## |
| 11 | ## Copyright (c) 2000 MontaVista Software, Inc. ## | 11 | ## Copyright (c) 2000 MontaVista Software, Inc. ## |
| @@ -1785,6 +1785,7 @@ sub dump_function($$) { | |||
| 1785 | $prototype =~ s/__devinit +//; | 1785 | $prototype =~ s/__devinit +//; |
| 1786 | $prototype =~ s/__init +//; | 1786 | $prototype =~ s/__init +//; |
| 1787 | $prototype =~ s/__init_or_module +//; | 1787 | $prototype =~ s/__init_or_module +//; |
| 1788 | $prototype =~ s/__must_check +//; | ||
| 1788 | $prototype =~ s/^#\s*define\s+//; #ak added | 1789 | $prototype =~ s/^#\s*define\s+//; #ak added |
| 1789 | $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; | 1790 | $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; |
| 1790 | 1791 | ||