diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /scripts/kernel-doc | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index fcdfb245a575..102e1235fd5c 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1454,6 +1454,8 @@ sub dump_enum($$) { | |||
| 1454 | my $file = shift; | 1454 | my $file = shift; |
| 1455 | 1455 | ||
| 1456 | $x =~ s@/\*.*?\*/@@gos; # strip comments. | 1456 | $x =~ s@/\*.*?\*/@@gos; # strip comments. |
| 1457 | $x =~ s/^#\s*define\s+.*$//; # strip #define macros inside enums | ||
| 1458 | |||
| 1457 | if ($x =~ /enum\s+(\w+)\s*{(.*)}/) { | 1459 | if ($x =~ /enum\s+(\w+)\s*{(.*)}/) { |
| 1458 | $declaration_name = $1; | 1460 | $declaration_name = $1; |
| 1459 | my $members = $2; | 1461 | my $members = $2; |