diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 23:09:15 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 23:09:15 +0100 |
commit | e4528d696f0fbb8eda231e2696b9ce0660f1e814 (patch) | |
tree | 84d88ee57b17b1830e1f1f7adb14773fe15d58c4 /scripts/kernel-doc | |
parent | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare... (diff) | |
parent | scripts/tags.sh: remove obsolete __devinit[const|data] (diff) | |
download | linux-e4528d696f0fbb8eda231e2696b9ce0660f1e814.tar.xz linux-e4528d696f0fbb8eda231e2696b9ce0660f1e814.zip |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild changes from Michal Marek:
- make tags fixes again
- scripts/show_delta fix for newer python
- scripts/kernel-doc does not fail on unknown function prototype
- one less coccinelle check this time
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/tags.sh: remove obsolete __devinit[const|data]
scripts/kernel-doc: make unknown function prototype a Warning instead of an Error
show_delta: Update script to support python versions 2.5 through 3.3
scripts/coccinelle/api: remove devm_request_and_ioremap.cocci
scripts/tags.sh: Increase identifier list
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-x | scripts/kernel-doc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index dbd3e1ebbdad..da058da413e7 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -2128,8 +2128,7 @@ sub dump_function($$) { create_parameterlist($args, ',', $file); } else { - print STDERR "Error(${file}:$.): cannot understand prototype: '$prototype'\n"; - ++$errors; + print STDERR "Warning(${file}:$.): cannot understand function prototype: '$prototype'\n"; return; } |