From b74bba8fd06ccf77c1084a25222b1c1e9474cdc1 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Fri, 12 Mar 2010 06:19:25 +0100
Subject: [PATCH] --- yaml --- r: 188390 b: refs/heads/master c:
 a91ed072d6135926c296a42b0b46de35e6347845 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 531f9961d3b0..13d3108b2bc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb35579b45bcb0b74167a2165d3ea973f640bf00
+refs/heads/master: a91ed072d6135926c296a42b0b46de35e6347845
diff --git a/trunk/arch/arm/include/asm/pgtable-nommu.h b/trunk/arch/arm/include/asm/pgtable-nommu.h
index 013cfcdc4839..ffc0e85775b4 100644
--- a/trunk/arch/arm/include/asm/pgtable-nommu.h
+++ b/trunk/arch/arm/include/asm/pgtable-nommu.h
@@ -67,6 +67,7 @@ static inline int pte_file(pte_t pte) { return 0; }
  */
 #define pgprot_noncached(prot)	__pgprot(0)
 #define pgprot_writecombine(prot) __pgprot(0)
+#define pgprot_dmacoherent(prot) __pgprot(0)
 
 
 /*