From deea2185d4b755a986c2e440519c172aeee80a7a Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Sat, 23 Feb 2008 15:24:01 -0800
Subject: [PATCH] --- yaml --- r: 86237 b: refs/heads/master c:
 00d6296145c6b671a9886e380efc24f2731d856a h: refs/heads/master i:   86235:
 8c9a05842647010ba0718b9712b751141601e1ed v: v3

---
 [refs]                   | 2 +-
 trunk/scripts/kernel-doc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bfddb3bd88ed..a1fcb3f6a325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff10e5dc1781cd0121f8ee936234c222ff15c105
+refs/heads/master: 00d6296145c6b671a9886e380efc24f2731d856a
diff --git a/trunk/scripts/kernel-doc b/trunk/scripts/kernel-doc
index 26146cbaa504..74c2f9db2aac 100755
--- a/trunk/scripts/kernel-doc
+++ b/trunk/scripts/kernel-doc
@@ -1512,13 +1512,13 @@ sub create_parameterlist($$$) {
 	    # corresponding data structures "correctly". Catch it later in
 	    # output_* subs.
 	    push_parameter($arg, "", $file);
-	} elsif ($arg =~ m/\(.*\*/) {
+	} elsif ($arg =~ m/\(.+\)\s*\(/) {
 	    # pointer-to-function
 	    $arg =~ tr/#/,/;
-	    $arg =~ m/[^\(]+\(\*\s*([^\)]+)\)/;
+	    $arg =~ m/[^\(]+\(\*?\s*(\w*)\s*\)/;
 	    $param = $1;
 	    $type = $arg;
-	    $type =~ s/([^\(]+\(\*)$param/$1/;
+	    $type =~ s/([^\(]+\(\*?)\s*$param/$1/;
 	    push_parameter($param, $type, $file);
 	} elsif ($arg) {
 	    $arg =~ s/\s*:\s*/:/g;