diff --git a/[refs] b/[refs]
index 565663a3baf7..b80c6283ee39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b94d10e7f6fce9af7d5054845511a00575c4b4f5
+refs/heads/master: 25c1a411e8a0a709abe3449866125dc290711ea8
diff --git a/trunk/arch/x86/include/asm/timer.h b/trunk/arch/x86/include/asm/timer.h
index a81195eaa2b3..bd37ed444a21 100644
--- a/trunk/arch/x86/include/asm/timer.h
+++ b/trunk/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;