From f308b2a71096ed06ab69cd8ecca6f52d51111aec Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 24 May 2011 17:13:41 -0700
Subject: [PATCH] --- yaml --- r: 250986 b: refs/heads/master c:
 0fccc6221821e07366aa44bca112c4edb6d04dd7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d9b668281ec0..959db38bef85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b05317221b7607ba61ee921c31867ed08912aa46
+refs/heads/master: 0fccc6221821e07366aa44bca112c4edb6d04dd7
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 0e158667d478..8657f99bfb2b 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1462,7 +1462,7 @@ sub process {
 #80 column limit
 		if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
 		    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
-		    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ ||
+		    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ ||
 		    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
 		    $length > 80)
 		{