Commit 25c1a411 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

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

Signed-off-by: default avatarStephen Rothwell <>
Signed-off-by: default avatarLinus Torvalds <>
parent b94d10e7
......@@ -12,9 +12,9 @@ unsigned long native_calibrate_tsc(void);
#ifdef CONFIG_X86_32
extern int timer_ack;
extern int recalibrate_cpu_khz(void);
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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment