diff --git a/[refs] b/[refs]
index 1f9757c2a1d9..af1fb26dcfae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57c351de715458f8fbee1e92e8cc65ddc00da04c
+refs/heads/master: aafab10d3f6b68150ec9fe75b1462764fd45b728
diff --git a/trunk/include/asm-x86/apic_32.h b/trunk/include/asm-x86/apic_32.h
index 4091b33dcb10..be158b27d54b 100644
--- a/trunk/include/asm-x86/apic_32.h
+++ b/trunk/include/asm-x86/apic_32.h
@@ -120,6 +120,7 @@ extern int local_apic_timer_disabled;
 
 #else /* !CONFIG_X86_LOCAL_APIC */
 static inline void lapic_shutdown(void) { }
+#define local_apic_timer_c2_ok		1
 
 #endif /* !CONFIG_X86_LOCAL_APIC */