diff --git a/[refs] b/[refs]
index 379fc525a4d5..040d4c0f144c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf48468fe84468a148e4f19465e0a725c0f977b
+refs/heads/master: 64ba4f230d30b089bc89db2e59d02c1efa5ac769
diff --git a/trunk/arch/x86/kernel/cpu/bugs.c b/trunk/arch/x86/kernel/cpu/bugs.c
index 027e5c003b16..170d2f5523b2 100644
--- a/trunk/arch/x86/kernel/cpu/bugs.c
+++ b/trunk/arch/x86/kernel/cpu/bugs.c
@@ -142,14 +142,6 @@ static void __init check_config(void)
 		panic("Kernel requires i486+ for 'invlpg' and other features");
 #endif
 
-/*
- * If we configured ourselves for a TSC, we'd better have one!
- */
-#ifdef CONFIG_X86_TSC
-	if (!cpu_has_tsc)
-		panic("Kernel compiled for Pentium+, requires TSC feature!");
-#endif
-
 /*
  * If we were told we had a good local APIC, check for buggy Pentia,
  * i.e. all B steppings and the C2 stepping of P54C when using their