diff --git a/[refs] b/[refs]
index 7bf6832de19b..28824068c4d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb3551491b20442c0de0d4debd54f40c654bbe98
+refs/heads/master: 1484096ceb4d5f2b27c0fe53f125ee0903eac9af
diff --git a/trunk/arch/x86/include/asm/pgtable_types.h b/trunk/arch/x86/include/asm/pgtable_types.h
index f80f5a66bb85..e5d5a8d3577c 100644
--- a/trunk/arch/x86/include/asm/pgtable_types.h
+++ b/trunk/arch/x86/include/asm/pgtable_types.h
@@ -217,4 +217,10 @@ extern pte_t *lookup_address(unsigned long address, unsigned int *level);
 
 #endif	/* !__ASSEMBLY__ */
 
+#ifdef CONFIG_X86_32
+# include "pgtable_32_types.h"
+#else
+# include "pgtable_64_types.h"
+#endif
+
 #endif /* _ASM_X86_PGTABLE_DEFS_H */