Merge commit 'v2.6.30' into for-2.6.31

1 files changed, 4 insertions, 3 deletions

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 0f11870116dc..3208a3a7e7fe 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1411,7 +1411,8 @@ sub dump_struct($$) {
     my $file = shift;
     my $nested;
 
-    if ($x =~/(struct|union)\s+(\w+)\s*{(.*)}/) {
+    if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
+        #my $decl_type = $1;
         $declaration_name = $2;
         my $members = $3;
 
@@ -1420,8 +1421,8 @@ sub dump_struct($$) {
         $nested = $1;
 
         # ignore members marked private:
-        $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos;
-        $members =~ s/\/\*.*?private:.*//gos;
+        $members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gos;
+        $members =~ s/\/\*\s*private:.*//gos;
         # strip comments:
         $members =~ s/\/\*.*?\*\///gos;
         $nested =~ s/\/\*.*?\*\///gos;