X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86_64%2Fapic.h;h=6c5d5ca8383a2abf4e2bd437bdb4ea865a6ec1e5;hb=1426d7a81dea8e9d85f9d69de85ab04ba37018ab;hp=16ec82e16b21aa18e400e269f386b3d52b3d9ee0;hpb=54522b6613a03807f057fd567794a31267ef85cb;p=powerpc.git

diff --git a/include/asm-x86_64/apic.h b/include/asm-x86_64/apic.h
index 16ec82e16b..6c5d5ca838 100644
--- 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 */