x86: fix mismerge in arch/x86/include/asm/timer.h

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / timer.h

diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 4f5c247248567708f0b4b599c8b618b12ddb458d..bd37ed444a21fe18af14826fef924ac0ec2bd5e5 100644 (file)
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -3,6 +3,7 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/percpu.h>
+#include <linux/interrupt.h>
 
 #define TICK_SIZE (tick_nsec / 1000)
 
@@ -11,7 +12,8 @@ unsigned long native_calibrate_tsc(void);
 
 #ifdef CONFIG_X86_32
 extern int timer_ack;
-#endif
+extern irqreturn_t timer_interrupt(int irq, void *dev_id);
+#endif /* CONFIG_X86_32 */
 extern int recalibrate_cpu_khz(void);
 
 extern int no_timer_check;