Merge branch 'linus' into perfcounters/core-v2

[pandora-kernel.git] / arch / x86 / include / asm / system_64.h

diff --git a/arch/x86/include/asm/system_64.h b/arch/x86/include/asm/system_64.h
index 5aedb8b..1159e09 100644 (file)
--- a/arch/x86/include/asm/system_64.h
+++ b/arch/x86/include/asm/system_64.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__SYSTEM_64_H
-#define ASM_X86__SYSTEM_64_H
+#ifndef _ASM_X86_SYSTEM_64_H
+#define _ASM_X86_SYSTEM_64_H
 
 #include <asm/segment.h>
 #include <asm/cmpxchg.h>
@@ -19,4 +19,4 @@ static inline void write_cr8(unsigned long val)
 
 #include <linux/irqflags.h>
 
-#endif /* ASM_X86__SYSTEM_64_H */
+#endif /* _ASM_X86_SYSTEM_64_H */