diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 11:07:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 11:07:34 -0400 |
| commit | 04197c83b3e05546d1003cfa3ff43f1639c0057f (patch) | |
| tree | c04ddce9f519b91c0b20c6c09f7529928350eefe /scripts/kernel-doc | |
| parent | 71998e83c520c7a91b254dc9705baeedbee0d44f (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
Merge branch 'linus' into x86/tracehook
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d8f77e26081c..ff787e6ff8ed 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc | |||
| @@ -1403,7 +1403,7 @@ sub dump_struct($$) { | |||
| 1403 | my $members = $3; | 1403 | my $members = $3; |
| 1404 | 1404 | ||
| 1405 | # ignore embedded structs or unions | 1405 | # ignore embedded structs or unions |
| 1406 | $members =~ s/{.*?}//g; | 1406 | $members =~ s/{.*}//g; |
| 1407 | 1407 | ||
| 1408 | # ignore members marked private: | 1408 | # ignore members marked private: |
| 1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; | 1409 | $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos; |