From 78ef86748804c6690e4f6b9fc7007a489d20073c Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Fri, 27 Feb 2009 14:03:08 -0800
Subject: [PATCH] --- yaml --- r: 131846 b: refs/heads/master c:
 667026e7b082ad59eb7194d6b5d159ed6c340e05 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5456381ae042..0d6431fbdd6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3340b35787975414d5f6fee83e00640688be2cb
+refs/heads/master: 667026e7b082ad59eb7194d6b5d159ed6c340e05
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 15a590425129..b9e9ee1315b7 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1686,8 +1686,8 @@ sub process {
 			# Modifiers should have spaces.
 			$to =~ s/(\b$Modifier$)/$1 /;
 
-			#print "from<$from> to<$to>\n";
-			if ($from ne $to) {
+			#print "from<$from> to<$to> ident<$ident>\n";
+			if ($from ne $to && $ident !~ /^$Modifier$/) {
 				ERROR("\"foo${from}bar\" should be \"foo${to}bar\"\n" .  $herecurr);
 			}
 		}