From 8f73eae3b91d2ccb6f8a2a45c3d73e995fc7fb04 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Fri, 23 Mar 2012 15:02:17 -0700
Subject: [PATCH] --- yaml --- r: 295207 b: refs/heads/master c:
 daebc534ac15f991961a5bb433e515988220e9bf h: refs/heads/master i:   295205:
 c63461a437662aed4a9dff48df68441d637e259e   295203:
 721cd24ba4dcc187e53f79e97285b7958fdf3384   295199:
 7d43e210cbe210dbce83bef90650638f2064b5b0 v: v3

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

diff --git a/[refs] b/[refs]
index 260eee9ffef7..25e306207816 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11232688ec41a507cdb476fc4e88aff8a3a34c3c
+refs/heads/master: daebc534ac15f991961a5bb433e515988220e9bf
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 0ee37bfdfd68..061c28e7bcfa 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -2391,7 +2391,7 @@ sub process {
 			my ($where, $prefix) = ($-[1], $1);
 			if ($prefix !~ /$Type\s+$/ &&
 			    ($where != 0 || $prefix !~ /^.\s+$/) &&
-			    $prefix !~ /{\s+$/) {
+			    $prefix !~ /[{,]\s+$/) {
 				ERROR("BRACKET_SPACE",
 				      "space prohibited before open square bracket '['\n" . $herecurr);
 			}