From baab3cedc63954c4d63767c9c2c15dd509b4b7b7 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Mon, 9 Aug 2010 17:20:57 -0700
Subject: [PATCH] --- yaml --- r: 207335 b: refs/heads/master c:
 7840a94cd12559d8aee6382fafb85fbc9eb3a2c2 h: refs/heads/master i:   207333:
 89a8cabd09d5a58401863793d75e6e291e438c41   207331:
 a2df85fb6d352d471bb9f4f58225165d742c1d43   207327:
 0506efce994e392b3df38b9fa54e57605ee6981d v: v3

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

diff --git a/[refs] b/[refs]
index 1e2742d9d51c..5f4be435cd8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1986aaf828ac8398b3d8d9b4151b08c840414ffe
+refs/heads/master: 7840a94cd12559d8aee6382fafb85fbc9eb3a2c2
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index bd88f11b0953..315faf99effd 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -224,6 +224,12 @@ sub help {
 	qr{fastcall},
 );
 
+our $allowed_asm_includes = qr{(?x:
+	irq|
+	memory
+)};
+# memory.h: ARM has a custom one
+
 sub build_types {
 	my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
 	my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
@@ -2308,7 +2314,7 @@ sub process {
 			my $checkfile = "include/linux/$file";
 			if (-f "$root/$checkfile" &&
 			    $realfile ne $checkfile &&
-			    $1 ne 'irq')
+			    $1 !~ /$allowed_asm_includes/)
 			{
 				if ($realfile =~ m{^arch/}) {
 					CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);