---

yaml --- r: 188390 b: refs/heads/master c: a91ed07 h: refs/heads/master v: v3
git-mirror · Mar 13, 2010 · b74bba8 · b74bba8
1 parent 345a716
commit b74bba8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)
 
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
     /*
@@ Expand Down @@