Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

[linux-2.6-omap-h63xx.git] / arch / x86 / lib / getuser.S

diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
index ad374003742f98534db184ebc1f019ff845141a4..51f1504cddd9f20fa50e010c66ec0d83da2c2215 100644 (file)
--- 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>