From db1f19c8f82cfa5bdd439547a510a8aaaf851971 Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Fri, 5 Jul 2013 19:56:08 -0700
Subject: [PATCH] [Stylecheck] Also accept the usage of the x defines.

---
 scripts/checkpatch.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5740d1ac..e76ed7cb 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2941,9 +2941,9 @@ sub process {
 			    $var =~ /[A-Z]\w*[a-z]|[a-z]\w*[A-Z]/ &&
 			    $var !~ /"^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
 			    !defined $camelcase{$var} &&
-			    !($line =~ /^[ +-]*#\s*define/ && $var =~ /[A-Z][A-Z0-9_]*x[A-Z0-9_]*\b/)) {
+			    $var !~ /[A-Z][A-Z0-9_]*x[A-Z0-9_]*\b/) {
 				$camelcase{$var} = 1;
-				#print "Camelcase line <<$line>>\n";
+				#print "Camelcase line <<$line>> <<$var>>\n";
 				WARN("CAMELCASE",
 				     "Avoid CamelCase: <$var>\n" . $herecurr);
 			}