Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / pgtable.h

diff --git a/include/asm-x86/pgtable.h b/arch/x86/include/asm/pgtable.h
similarity index 99%
rename from include/asm-x86/pgtable.h
rename to arch/x86/include/asm/pgtable.h
index a3dda6d615be223d1275eb8eecd89bcbc2a3b354..c012f3b11671574150720dcaee023780cd79d905 100644 (file)
--- a/include/asm-x86/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__PGTABLE_H
-#define ASM_X86__PGTABLE_H
+#ifndef _ASM_X86_PGTABLE_H
+#define _ASM_X86_PGTABLE_H
 
 #define FIRST_USER_ADDRESS     0
 
@@ -559,4 +559,4 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
 #include <asm-generic/pgtable.h>
 #endif /* __ASSEMBLY__ */
 
-#endif /* ASM_X86__PGTABLE_H */
+#endif /* _ASM_X86_PGTABLE_H */