projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b94d10e)
x86: fix mismerge in arch/x86/include/asm/timer.h
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Mar 2009 00:10:27 +0000 (11:10 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2009 17:10:49 +0000 (10:10 -0700)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/include/asm/timer.h patch | blob | blame | history

diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index a81195eaa2b3dc3d4378d523ee79c256ca752e52..bd37ed444a21fe18af14826fef924ac0ec2bd5e5 100644 (file)
--- 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;