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

[mv-sheeva.git] / include / asm-x86 / timer.h

diff --git a/include/asm-x86/timer.h b/include/asm-x86/timer.h
index 2a8a92d5787b4cb85e75e8feb6334fb9c9ca868e..d0babce4b47a6ecbc9d3ca62bf084665c49a02b9 100644 (file)
--- a/include/asm-x86/timer.h
+++ b/include/asm-x86/timer.h
@@ -1,5 +1,5 @@
-#ifndef _ASMi386_TIMER_H
-#define _ASMi386_TIMER_H
+#ifndef ASM_X86__TIMER_H
+#define ASM_X86__TIMER_H
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/percpu.h>
@@ -63,4 +63,4 @@ static inline unsigned long long cycles_2_ns(unsigned long long cyc)
        return ns;
 }
 
-#endif
+#endif /* ASM_X86__TIMER_H */