projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core
[linux-2.6-block.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 */