From 66feea7a0d5bdf0d33a9cfaffa2216199be7fe30 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Fri, 23 Mar 2012 15:02:18 -0700
Subject: [PATCH] --- yaml --- r: 295211 b: refs/heads/master c:
 b337d8b82f235d0212f7adcaeb431fd4e688bb98 h: refs/heads/master i:   295209:
 15fda009f7c0f4e3383a71ee3c07d8f94a53997c   295207:
 8f73eae3b91d2ccb6f8a2a45c3d73e995fc7fb04 v: v3

---
 [refs]                      | 2 +-
 trunk/scripts/checkpatch.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6812d3c9dbf0..dca8df6d64ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd1b57ac73f169a5ba7a9569989aad40184f6340
+refs/heads/master: b337d8b82f235d0212f7adcaeb431fd4e688bb98
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index ec58d3152e71..07d718415c5c 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -323,7 +323,7 @@ sub build_types {
 		  }x;
 	$Type	= qr{
 			$NonptrType
-			(?:[\s\*]+\s*const|[\s\*]+|(?:\s*\[\s*\])+)?
+			(?:(?:\s|\*|\[\])+\s*const|(?:\s|\*|\[\])+|(?:\s*\[\s*\])+)?
 			(?:\s+$Inline|\s+$Modifier)*
 		  }x;
 	$Declare	= qr{(?:$Storage\s+)?$Type};