1 files changed, 0 insertions, 49 deletions

diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index fb7a0909a174..171ec2dc8c04 100644
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -10,48 +10,6 @@
  * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
  */
 
-#ifdef CONFIG_X86_IO_APIC
-
-#ifdef CONFIG_PCI_MSI
-static inline int use_pci_vector(void)  {return 1;}
-static inline void disable_edge_ioapic_vector(unsigned int vector) { }
-static inline void mask_and_ack_level_ioapic_vector(unsigned int vector) { }
-static inline void end_edge_ioapic_vector (unsigned int vector) { }
-#define startup_level_ioapic    startup_level_ioapic_vector
-#define shutdown_level_ioapic   mask_IO_APIC_vector
-#define enable_level_ioapic     unmask_IO_APIC_vector
-#define disable_level_ioapic    mask_IO_APIC_vector
-#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_vector
-#define end_level_ioapic        end_level_ioapic_vector
-#define set_ioapic_affinity     set_ioapic_affinity_vector
-
-#define startup_edge_ioapic     startup_edge_ioapic_vector
-#define shutdown_edge_ioapic    disable_edge_ioapic_vector
-#define enable_edge_ioapic      unmask_IO_APIC_vector
-#define disable_edge_ioapic     disable_edge_ioapic_vector
-#define ack_edge_ioapic         ack_edge_ioapic_vector
-#define end_edge_ioapic         end_edge_ioapic_vector
-#else
-static inline int use_pci_vector(void)  {return 0;}
-static inline void disable_edge_ioapic_irq(unsigned int irq) { }
-static inline void mask_and_ack_level_ioapic_irq(unsigned int irq) { }
-static inline void end_edge_ioapic_irq (unsigned int irq) { }
-#define startup_level_ioapic    startup_level_ioapic_irq
-#define shutdown_level_ioapic   mask_IO_APIC_irq
-#define enable_level_ioapic     unmask_IO_APIC_irq
-#define disable_level_ioapic    mask_IO_APIC_irq
-#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_irq
-#define end_level_ioapic        end_level_ioapic_irq
-#define set_ioapic_affinity     set_ioapic_affinity_irq
-
-#define startup_edge_ioapic     startup_edge_ioapic_irq
-#define shutdown_edge_ioapic    disable_edge_ioapic_irq
-#define enable_edge_ioapic      unmask_IO_APIC_irq
-#define disable_edge_ioapic     disable_edge_ioapic_irq
-#define ack_edge_ioapic         ack_edge_ioapic_irq
-#define end_edge_ioapic         end_edge_ioapic_irq
-#endif
-
 #define APIC_MISMATCH_DEBUG
 
 #define IO_APIC_BASE(idx) \
@@ -204,17 +162,10 @@ 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 */ 
 
-#else  /* !CONFIG_X86_IO_APIC */
-#define io_apic_assign_pci_irqs 0
-#endif
-
-extern int assign_irq_vector(int irq);
-
 void enable_NMI_through_LVT0 (void * dummy);
 
 extern spinlock_t i8259A_lock;