diff options
| author | Chris Ball <cjb@laptop.org> | 2013-03-19 13:07:13 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-03-19 13:07:13 -0400 |
| commit | 2c06aeb25ca92b839399c4e2c956cffc95b41978 (patch) | |
| tree | 3fb5007eac3adb9d4c973978c3b084fa077e926b /scripts/kernel-doc | |
| parent | 9665f7f234d095fc7c28c70df819a3f7b6a7b4e8 (diff) | |
| parent | 908ab9368866e6edf0edebdd546adefd5f3128f9 (diff) | |
Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into mmc-next
ARM: tegra: DT-related fixes needed by the MMC tree
In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.
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($$) { # strip kmemcheck_bitfield_{begin,end}.*; $members =~ s/kmemcheck_bitfield_.*?;//gos; # strip attributes - $members =~ s/__aligned\s*\(\d+\)//gos; + $members =~ s/__aligned\s*\(.+\)//gos; create_parameterlist($members, ';', $file); check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); |