Merge branch 'linus' into x86/pat2

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

diff --git a/include/asm-x86/cacheflush.h b/include/asm-x86/cacheflush.h
index 092b9b4eb00301d765aa385c3f21c74c5eb80807..68840ef1b35a01c01fa7e23e45f3b5c0415d39e8 100644 (file)
--- a/include/asm-x86/cacheflush.h
+++ b/include/asm-x86/cacheflush.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_X86_CACHEFLUSH_H
-#define _ASM_X86_CACHEFLUSH_H
+#ifndef ASM_X86__CACHEFLUSH_H
+#define ASM_X86__CACHEFLUSH_H
 
 /* Keep includes the same across arches.  */
 #include <linux/mm.h>
@@ -115,4 +115,4 @@ static inline int rodata_test(void)
 }
 #endif
 
-#endif
+#endif /* ASM_X86__CACHEFLUSH_H */