commit 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2
author Alok Kataria <akataria@vmware.com> Tue Jul 01 11:43:34 2008 -0700
committer Ingo Molnar <mingo@elte.hu> Wed Jul 09 07:43:27 2008 +0200
tree 3b7c8e4ee74ef5fec07f64ea56bff60afb433c2c
parent 2dbe06faf37b39f9ecffc054dd173b2a1dc2adcd

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>

include/asm-x86/time.h

diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h
index bce72d7..a17fa47 100644
--- a/include/asm-x86/time.h
+++ b/include/asm-x86/time.h
@@ -56,4 +56,6 @@
 
 #endif /* CONFIG_PARAVIRT */
 
+extern unsigned long __init calibrate_cpu(void);
+
 #endif