diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /scripts/kernel-doc | |
| parent | 3c955b407a084810f57260d61548cc92c14bc627 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
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; |