X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-i386%2Ftimer.h;h=d0ebd05f85169e5711a666d309522077a26986ea;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=41adcaeaa5480ada3c77716347eecf1906f5a195;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h
index 41adcaeaa..d0ebd05f8 100644
--- a/include/asm-i386/timer.h
+++ b/include/asm-i386/timer.h
@@ -1,52 +1,13 @@
 #ifndef _ASMi386_TIMER_H
 #define _ASMi386_TIMER_H
-
-/**
- * struct timer_ops - used to define a timer source
- *
- * @init: Probes and initializes the timer. Takes clock= override 
- *  string as an argument. Returns 0 on success, anything else on failure.
- * @mark_offset: called by the timer interrupt
- * @get_offset: called by gettimeofday().  Returns the number of ms since the
- *	last timer intruupt.
- */
-struct timer_opts{
-	char* name;
-	int (*init)(char *override);
-	void (*mark_offset)(void);
-	unsigned long (*get_offset)(void);
-	unsigned long long (*monotonic_clock)(void);
-	void (*delay)(unsigned long);
-};
+#include <linux/init.h>
+#include <linux/pm.h>
 
 #define TICK_SIZE (tick_nsec / 1000)
-
-extern struct timer_opts* select_timer(void);
-extern void clock_fallback(void);
-
+void setup_pit_timer(void);
 /* Modifiers for buggy PIT handling */
-
 extern int pit_latch_buggy;
-
-extern struct timer_opts *cur_timer;
 extern int timer_ack;
+extern int recalibrate_cpu_khz(void);
 
-/* list of externed timers */
-extern struct timer_opts timer_none;
-extern struct timer_opts timer_pit;
-extern struct timer_opts timer_tsc;
-#ifdef CONFIG_X86_CYCLONE_TIMER
-extern struct timer_opts timer_cyclone;
-#endif
-
-extern unsigned long calibrate_tsc(void);
-extern void init_cpu_khz(void);
-#ifdef CONFIG_HPET_TIMER
-extern struct timer_opts timer_hpet;
-extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);
-#endif
-
-#ifdef CONFIG_X86_PM_TIMER
-extern struct timer_opts timer_pmtmr;
-#endif
 #endif