aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/time.h
diff options
context:
space:
mode:
authorAlok Kataria <akataria@vmware.com>2008-07-01 14:43:34 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 01:43:27 -0400
commit8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (patch)
tree3b7c8e4ee74ef5fec07f64ea56bff60afb433c2c /include/asm-x86/time.h
parent2dbe06faf37b39f9ecffc054dd173b2a1dc2adcd (diff)
x86: merge tsc_init and clocksource code
Unify the clocksource code. Unify the tsc_init code. Signed-off-by: Alok N Kataria <akataria@vmware.com> Signed-off-by: Dan Hecht <dhecht@vmware.com> Cc: Dan Hecht <dhecht@vmware.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/time.h')
-rw-r--r--include/asm-x86/time.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index bce72d7a958c..a17fa473e91d 100644
--- a/include/asm-x86/time.h
+++ b/include/asm-x86/time.h
@@ -56,4 +56,6 @@ static inline int native_set_wallclock(unsigned long nowtime)
56 56
57#endif /* CONFIG_PARAVIRT */ 57#endif /* CONFIG_PARAVIRT */
58 58
59extern unsigned long __init calibrate_cpu(void);
60
59#endif 61#endif