diff --git a/[refs] b/[refs] index c051305645a3..fd826ece540f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67c5fc5c330f63360e26609534b219df1aaa03ca +refs/heads/master: 63fefb7d5bac6e65b5df2b7eb4aa56bb4bbadd48 diff --git a/trunk/include/asm-x86/io_apic_64.h b/trunk/include/asm-x86/io_apic_64.h index e2c13675ee4e..762a841b939e 100644 --- a/trunk/include/asm-x86/io_apic_64.h +++ b/trunk/include/asm-x86/io_apic_64.h @@ -129,10 +129,4 @@ extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int); extern int sis_apic_bug; /* dummy */ -void enable_NMI_through_LVT0 (void * dummy); - -extern spinlock_t i8259A_lock; - -extern int timer_over_8254; - #endif