diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:57 +0000 |
| commit | a47897538c3e1f71c35691a1f73e73dd9149977c (patch) | |
| tree | 462c858397564058dbc996c6ab71613b6d1e35c8 /scripts | |
| parent | 7368857a8eed5144e56e65713970764ef0f2f0b8 (diff) | |
| parent | a2ab9187600ddca13da9e5c20e3abb92ea885ddd (diff) | |
Merge tag 'v3.14.29' into linux-linaro-lsk-v3.14
This is the 3.14.29 stable release
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); |