diff --git a/[refs] b/[refs] index bed06bb3407a..2112353411f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: addcdcea99514bee64b5bf091ac9fd2fc5da65cf +refs/heads/master: 6b48db24e30d371bc54566667b82ca3d64aab80a diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 497416c8360b..eb4b55940c0e 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -315,7 +315,7 @@ sub build_types { $NonptrType = qr{ (?:$Modifier\s+|const\s+)* (?: - (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)| + (?:typeof|__typeof__)\s*\([^\)]*\)| (?:$typeTypedefs\b)| (?:${all}\b) )