diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 17:15:01 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 17:15:01 (GMT) |
commit | e9ce0c37c2cb203a4fa6a350108199da0cad5a17 (patch) | |
tree | 9947d729a5c44e4312d90210dd5ba605acffde53 /arch/x86/lib/getuser.S | |
parent | a7eb518998529c08cc53fef17756d9fe433b0c23 (diff) | |
parent | 8960f8c8e779fa405f031ca6866d6d3ab88e2eae (diff) | |
download | linux-fsl-qoriq-e9ce0c37c2cb203a4fa6a350108199da0cad5a17.tar.xz |
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
Diffstat (limited to 'arch/x86/lib/getuser.S')
-rw-r--r-- | arch/x86/lib/getuser.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S index ad37400..51f1504 100644 --- a/arch/x86/lib/getuser.S +++ b/arch/x86/lib/getuser.S @@ -28,7 +28,7 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> -#include <asm/page.h> +#include <asm/page_types.h> #include <asm/errno.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> |