---

yaml --- r: 157119 b: refs/heads/master c: 9fd926b h: refs/heads/master i: 157117: 6c75272 157115: 4d19cdf 157111: 2d46bae 157103: b0301f7 157087: 6c12a67 157055: 2093ba6 v: v3
git-mirror · Aug 26, 2009 · 3833902 · 3833902
1 parent 24d5615
commit 3833902
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8
+refs/heads/master: 9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88
diff --git a/trunk/arch/m68k/include/asm/pgtable_mm.h b/trunk/arch/m68k/include/asm/pgtable_mm.h
@@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
 #endif
 
 #ifndef __ASSEMBLY__
-#include <asm-generic/pgtable.h>
-
 /*
  * Macro to mark a page protection value as "uncacheable".
  */
@@ -154,6 +152,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
 	    ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S))	\
 	    : (prot)))
 
+#include <asm-generic/pgtable.h>
 #endif /* !__ASSEMBLY__ */
 
 /*