From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Mar 2009 00:10:27 +0000 (+1100)
Subject: x86: fix mismerge in arch/x86/include/asm/timer.h
X-Git-Tag: v3.12-rc1~15593
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25c1a411e8a0a709abe3449866125dc290711ea8;p=kernel%2Fkernel-generic.git

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

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index a81195e..bd37ed4 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -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;