diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:07:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-16 22:07:07 +0000 |
| commit | 326dc1f1f301eaaf91619c359b85cd98c2ff4374 (patch) | |
| tree | 627fe244b8cd12302cd94328223bbd8d74553c52 /scripts | |
| parent | 8b16dde2a85c26b48518758c99a7b4ce4820b019 (diff) | |
| parent | a47897538c3e1f71c35691a1f73e73dd9149977c (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kernel-doc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index da058da413e7..2438cc351952 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1753,7 +1753,7 @@ sub dump_struct($$) { # strip kmemcheck_bitfield_{begin,end}.*; $members =~ s/kmemcheck_bitfield_.*?;//gos; # strip attributes - $members =~ s/__aligned\s*\(.+\)//gos; + $members =~ s/__aligned\s*\([^;]*\)//gos; create_parameterlist($members, ';', $file); check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); |