x86: change early_ioremap to use slots instead of nesting

[safe/jmp/linux-2.6] / include / asm-x86 / time.h

diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index 68779b0..3e724ee 100644 (file)
--- a/include/asm-x86/time.h
+++ b/include/asm-x86/time.h
@@ -1,7 +1,6 @@
-#ifndef _ASMX86_TIME_H
-#define _ASMX86_TIME_H
+#ifndef ASM_X86__TIME_H
+#define ASM_X86__TIME_H
 
-extern void (*late_time_init)(void);
 extern void hpet_time_init(void);
 
 #include <asm/mc146818rtc.h>
@@ -47,6 +46,8 @@ static inline int native_set_wallclock(unsigned long nowtime)
 
 #endif
 
+extern void time_init(void);
+
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else /* !CONFIG_PARAVIRT */
@@ -57,4 +58,6 @@ static inline int native_set_wallclock(unsigned long nowtime)
 
 #endif /* CONFIG_PARAVIRT */
 
-#endif
+extern unsigned long __init calibrate_cpu(void);
+
+#endif /* ASM_X86__TIME_H */