diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /scripts/kernel-doc | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'scripts/kernel-doc')
| -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 f565536a2bef..4305b2f2ec5e 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1750,7 +1750,7 @@ sub dump_struct($$) { | |||
| 1750 | # strip kmemcheck_bitfield_{begin,end}.*; | 1750 | # strip kmemcheck_bitfield_{begin,end}.*; |
| 1751 | $members =~ s/kmemcheck_bitfield_.*?;//gos; | 1751 | $members =~ s/kmemcheck_bitfield_.*?;//gos; |
| 1752 | # strip attributes | 1752 | # strip attributes |
| 1753 | $members =~ s/__aligned\s*\(\d+\)//gos; | 1753 | $members =~ s/__aligned\s*\(.+\)//gos; |
| 1754 | 1754 | ||
| 1755 | create_parameterlist($members, ';', $file); | 1755 | create_parameterlist($members, ';', $file); |
| 1756 | check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); | 1756 | check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); |