diff --git a/[refs] b/[refs]
index c07e0dc91267..3673888de05b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0fbf0abc093ec8bf64506eee4ede9e5daf40ffd
+refs/heads/master: f8dd0d3c62164160c59034a96eb17d69ac8a0328
diff --git a/trunk/include/asm-x86/delay.h b/trunk/include/asm-x86/delay.h
index bb80880c834b..409a649204aa 100644
--- a/trunk/include/asm-x86/delay.h
+++ b/trunk/include/asm-x86/delay.h
@@ -26,10 +26,6 @@ extern void __delay(unsigned long loops);
 	((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
 	__ndelay(n))
 
-#ifdef CONFIG_X86_32
 void use_tsc_delay(void);
-#else
-#define use_tsc_delay() {}
-#endif
 
 #endif /* _ASM_X86_DELAY_H */