diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-16 22:06:35 +0000 |
| commit | c293f79246d7cdaf6e75b40aa1f957eb8d195835 (patch) | |
| tree | 2559c41e0baa8e0f160ce033e1b4c245d0ce0dcf /scripts | |
| parent | 2156eda2aafa0b0f660656246a11d7c2a9947ff9 (diff) | |
| parent | 5054319d9fe56ed1ef6c83c00ae37fdc2b277a79 (diff) | |
Merge tag 'v3.10.65' into linux-linaro-lsk
This is the 3.10.65 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 4305b2f2ec5e..8c0e07b7a70b 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1750,7 +1750,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); |