From ff91ba0f6ef05b7e1b14383868f48ea09b333b27 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 3 Jan 2011 02:26:53 +0100
Subject: [PATCH] --- yaml --- r: 223750 b: refs/heads/master c:
 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/include/asm/system.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f485cb36146a..c815bcba4828 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d13e5edd7284bedcf5952e1b6490e39ad843cb91
+refs/heads/master: 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026
diff --git a/trunk/arch/arm/include/asm/system.h b/trunk/arch/arm/include/asm/system.h
index 1120f18a6b17..80025948b8ad 100644
--- a/trunk/arch/arm/include/asm/system.h
+++ b/trunk/arch/arm/include/asm/system.h
@@ -150,6 +150,7 @@ extern unsigned int user_debug;
 #define rmb()		dmb()
 #define wmb()		mb()
 #else
+#include <asm/memory.h>
 #define mb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
 #define rmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)
 #define wmb()	do { if (arch_is_coherent()) dmb(); else barrier(); } while (0)