Merge branch 'ux500/devel' into next/devel

[~andy/linux] / arch / x86 / mm / fault.c

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9c7378df740a66777f78384a615233ff0bfc12fb..5db0490deb070d12368aeee042b8edc35ed456d6 100644 (file)
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -17,7 +17,7 @@
 #include <asm/traps.h>                 /* dotraplinkage, ...           */
 #include <asm/pgalloc.h>               /* pgd_*(), ...                 */
 #include <asm/kmemcheck.h>             /* kmemcheck_*(), ...           */
-#include <asm/vsyscall.h>
+#include <asm/fixmap.h>                        /* VSYSCALL_START               */
 
 /*
  * Page fault error code bits: