Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal

[net-next-2.6.git] / include / asm-x86 / time.h

diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index 5f4fc3e02387358b8246de6d50eba15341155573..3e724eef7ac468f118bb8c7c95edac31577cc739 100644 (file)
--- a/include/asm-x86/time.h
+++ b/include/asm-x86/time.h
@@ -1,5 +1,5 @@
-#ifndef _ASMX86_TIME_H
-#define _ASMX86_TIME_H
+#ifndef ASM_X86__TIME_H
+#define ASM_X86__TIME_H
 
 extern void hpet_time_init(void);
 
@@ -60,4 +60,4 @@ extern void time_init(void);
 
 extern unsigned long __init calibrate_cpu(void);
 
-#endif
+#endif /* ASM_X86__TIME_H */