From 3833902f90c3a3cc7bb5083029e9d92072e2bed6 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Thu, 9 Jul 2009 17:08:38 +0400 Subject: [PATCH] --- yaml --- r: 157119 b: refs/heads/master c: 9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88 h: refs/heads/master i: 157117: 6c7527293e193de15503549762dfe66e578bf595 157115: 4d19cdfff72966adc3a4ea5139c59dc1a150e80f 157111: 2d46baee34a36e3ad6d7f87afba98945ca542265 157103: b0301f75c4982ef5317e008525bbf22bc7a5c333 157087: 6c12a6778cd061a3c3143a9daae8c204f2a0b8be 157055: 2093ba6b4a24257dc87ae3f484d3d4f79b1932ed v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/pgtable_mm.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1ed3cbe0e92..e470226f9450 100644 --- 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 index 0b604f0f192d..fe60e1abaee8 100644 --- 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 - /* * 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 #endif /* !__ASSEMBLY__ */ /*