Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b94d10e7

arch/x86/include/asm/timer.h

+1 −1
Original line number Diff line number Diff line
@@ -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;