Merge branch 'linux-2.6'

[linux-2.6] / include / asm-x86 / apic_32.h

diff --git a/include/asm-x86/apic_32.h b/include/asm-x86/apic_32.h
index 4091b33dcb10f28cfbd1ae1013b3477e2512e742..be158b27d54b38854f8c63d713daa83fbdaa3954 100644 (file)
--- a/include/asm-x86/apic_32.h
+++ b/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 */