Merge /spare/repo/linux-2.6/

[cascardo/linux.git] / include / asm-x86_64 / apic.h

diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h
index 16ec82e..6c5d5ca 100644 (file)
--- a/include/asm-x86_64/apic.h
+++ b/include/asm-x86_64/apic.h
@@ -109,9 +109,10 @@ extern unsigned int nmi_watchdog;
 #define NMI_LOCAL_APIC 2
 #define NMI_INVALID    3
 
+extern int disable_timer_pin_1;
+
 #endif /* CONFIG_X86_LOCAL_APIC */
 
-#define esr_disable 0
 extern unsigned boot_cpu_id;
 
 #endif /* __ASM_APIC_H */