Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / include / asm-sh64 / mmu_context.h

diff --git a/include/asm-sh64/mmu_context.h b/include/asm-sh64/mmu_context.h
index f062e1513272745e1f1432749894ddcb1cf5660c..507bf72bb8e10b13f8bbf0dd82069fa297124f59 100644 (file)
--- a/include/asm-sh64/mmu_context.h
+++ b/include/asm-sh64/mmu_context.h
@@ -26,9 +26,8 @@
  */
 extern unsigned long mmu_context_cache;
 
-#include <linux/config.h>
 #include <asm/page.h>
-
+#include <asm-generic/mm_hooks.h>
 
 /* Current mm's pgd */
 extern pgd_t *mmu_pdtp_cache;
@@ -50,7 +49,7 @@ extern pgd_t *mmu_pdtp_cache;
  */
 #define MMU_VPN_MASK   0xfffff000
 
-extern __inline__ void
+static inline void
 get_new_mmu_context(struct mm_struct *mm)
 {
        extern void flush_tlb_all(void);