diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-18 05:57:32 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-18 05:57:57 -0400 |
| commit | aa1262b3876ec5249ff464618a7dcd46b3ca54e2 (patch) | |
| tree | b150bb2c83c073e1f0e298ba7899148f7d991ef7 /scripts/kernel-doc | |
| parent | 806b2139db236e0cbd0b5833ab0ce139f0196bcd (diff) | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to the newly
added ITG-3200 driver.
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); |