diff --git a/[refs] b/[refs]
index 9ee907a021c5..44d1084ec668 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40fec50ac4dd436b06630f415789e57200c5b06f
+refs/heads/master: 80ca9c98f50c11b63b87971594d7e38cba0bbcef
diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
index 8ed1ebf666be..a47e526716f4 100644
--- a/trunk/include/asm-x86/proto.h
+++ b/trunk/include/asm-x86/proto.h
@@ -51,11 +51,8 @@ extern void check_efer(void);
 extern unsigned long table_start, table_end;
 
 extern int exception_trace;
-extern unsigned cpu_khz;
-extern unsigned tsc_khz;
 
 extern int reboot_force;
-extern int notsc_setup(char *);
 
 extern int gsi_irq_sharing(int gsi);
 
diff --git a/trunk/include/asm-x86/tsc.h b/trunk/include/asm-x86/tsc.h
index 6baab30dc2c8..d7b1c4e7a108 100644
--- a/trunk/include/asm-x86/tsc.h
+++ b/trunk/include/asm-x86/tsc.h
@@ -73,8 +73,7 @@ int check_tsc_unstable(void);
 extern void check_tsc_sync_source(int cpu);
 extern void check_tsc_sync_target(void);
 
-#ifdef CONFIG_X86_64
 extern void tsc_calibrate(void);
-#endif
+extern int notsc_setup(char *);
 
 #endif