Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[mv-sheeva.git] / include / asm-i386 / timer.h

diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h
index 1ee64e34cd35b4d23523708763690dac3fd60c3e..4752c3a6a7089580eaf6b18333f26eadc94e18c8 100644 (file)
--- a/include/asm-i386/timer.h
+++ b/include/asm-i386/timer.h
@@ -9,6 +9,8 @@ void setup_pit_timer(void);
 extern int pit_latch_buggy;
 extern int timer_ack;
 extern int no_timer_check;
+extern unsigned long long (*custom_sched_clock)(void);
+extern int no_sync_cmos_clock;
 extern int recalibrate_cpu_khz(void);
 
 #endif