Merge branch 'linus' into x86/pat2

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

diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
index 3407ac12ba34e6f20cfeddb3aff796f91aabe578..c91574776751396207f1aa2ce903e15a82239d47 100644 (file)
--- a/include/asm-x86/page.h
+++ b/include/asm-x86/page.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_PAGE_H
-#define _ASM_X86_PAGE_H
+#ifndef ASM_X86__PAGE_H
+#define ASM_X86__PAGE_H
 
 #include <linux/const.h>
 
@@ -200,4 +200,4 @@ static inline pteval_t native_pte_flags(pte_t pte)
 #define __HAVE_ARCH_GATE_AREA 1
 
 #endif /* __KERNEL__ */
-#endif /* _ASM_X86_PAGE_H */
+#endif /* ASM_X86__PAGE_H */