Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / include / asm-x86_64 / io_apic.h

diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index b26248b0e373e8cf0ccdab626ff0d446e1fa431c..171ec2dc8c04f57e6842cab9ddfd92a4b51751f0 100644 (file)
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -162,7 +162,6 @@ extern int skip_ioapic_setup;
 extern int io_apic_get_version (int ioapic);
 extern int io_apic_get_redir_entries (int ioapic);
 extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int);
-extern int timer_uses_ioapic_pin_0;
 #endif
 
 extern int sis_apic_bug; /* dummy */