summaryrefslogtreecommitdiffstats
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-02-22 18:36:17 -0700
committerGrant Likely <grant.likely@secretlab.ca>2012-02-22 18:36:17 -0700
commitdaefd89efc279b142bbb054577c2d706da211723 (patch)
tree2298056232548f6f22d7bbff2662a2bbf64520de /scripts/kernel-doc
parent6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff)
parentf86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff)
downloadcachepc-linux-daefd89efc279b142bbb054577c2d706da211723.tar.gz
cachepc-linux-daefd89efc279b142bbb054577c2d706da211723.zip
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc3
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;
## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ##
## Copyright (C) 2000, 1 Tim Waugh <twaugh@redhat.com> ##
## Copyright (C) 2001 Simon Huggins ##
-## Copyright (C) 2005-2010 Randy Dunlap ##
+## Copyright (C) 2005-2012 Randy Dunlap ##
## ##
## #define enhancements by Armin Kuster <akuster@mvista.com> ##
## Copyright (c) 2000 MontaVista Software, Inc. ##
@@ -1785,6 +1785,7 @@ sub dump_function($$) {
$prototype =~ s/__devinit +//;
$prototype =~ s/__init +//;
$prototype =~ s/__init_or_module +//;
+ $prototype =~ s/__must_check +//;
$prototype =~ s/^#\s*define\s+//; #ak added
$prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//;